auto update

diff --git a/doc/private/branches b/doc/private/branches
index 7d0b960270da272fdd020e4497b5c5d4e697d481..dac0a5cc0468887de0f72ccd293639c06c412050 100644 (file)
--- a/doc/private/branches
+++ b/doc/private/branches
@@ -1,6 +1,6 @@
 
 Branch                         Status  Whom    (Comments)
--------------------------------------------------------
+----------------------------------------------------------
 
 additional_cache               review          (additional RRs caching for performance)
 additional_cache_rt6496                new     
@@ -9,7 +9,6 @@ bind9-gss-tsig                  new
 bind9-gsstsig                  new     
 compiled_zonefile              open            (wire format zone file, under development)
 da                             new     
-delegation_only                        closed  
 dlz                            open    sra     (dynamicly loadable zones)
 ds                             new     
 ds13                           new     
@@ -25,93 +24,22 @@ peter                               private peter   (hostname.bind for 9.2.x)
 queryperf-v6                   review          (IPv6 transport support for queryperf)
 rdata_split                    new     
 rt10038                                new     
-rt10049                                closed  
-rt10105                                closed  
-rt10114                                closed  
-rt10115                                closed  
-rt10131                                closed  
-rt10147                                closed  
-rt10148                                closed  
-rt10150                                closed  
-rt10194                                closed  
-rt10202                                closed  
-rt10208                                closed  
-rt10221                                closed  
-rt10236                                closed  
 rt10272                                new     
 rt10272a                       new     
-rt10331                                closed  
-rt10345                                closed  
-rt10346                                closed  
-rt10381                                closed  
 rt10440                                new     
 rt10440a                       new     
-rt10452                                closed  
-rt10461                                closed  
-rt10497                                closed  
-rt10508                                closed  
-rt10565                                closed  
-rt10590                                closed  
-rt10642                                closed  
-rt10704                                closed  
-rt10764                                closed  (empty) 
-rt10838                                closed  
-rt10847                                closed  
-rt10861                                closed  
-rt10864                                open    marka   
-rt10920                                closed  
-rt10925                                closed  
-rt10929                                closed  
-rt10991                                closed  
-rt11013                                closed  
-rt11065                                closed  
+rt10864                                open    marka
 rt11069                                new     
 rt11069_v9_2                   new     
-rt11101                                closed  
-rt11116                                closed  
-rt11117                                closed  
-rt11118                                closed  
-rt11119                                closed  
-rt11127                                closed  
-rt11132                                closed  
-rt11149                                closed  
 rt11156                                new     
 rt11156_v9_2                   new     
 rt11163                                new     
 rt11163_1                      new     
-rt11177                                closed  
-rt11179                                closed  
 rt11206                                new     
-rt11208                                closed  
-rt11237                                closed  
-rt11280                                closed  
-rt11288                                closed  
-rt11331                                closed  
-rt113347                       closed  (rt11347)
-rt11360                                closed  
-rt11398                                closed
 rt11398a                       open    sra     (doxygen dev)
-rt11398b                       closed
-rt11398c                       closed  
-rt11432                                closed  
-rt11436                                closed  
-rt11439                                closed
-rt11445                                closed  
-rt11446                                closed  
-rt11486                                closed  
-rt11541                                closed  
-rt11542                                closed  
-rt11543                                open    jakob   
-rt11582                                closed  
-rt11595                                closed  
-rt11600                                closed  
-rt11681                                closed  
-rt11697                                closed  
-rt11706                                closed  
-rt11714                                closed  
+rt11543                                open    jakob
 rt11733                                new     
 rt11733b                       new     
-rt11742                                closed  
 rt11943                                new     
 rt12023                                new     
 rt12024                                new     
@@ -224,7 +152,6 @@ rt1572a                             new
 rt288                          new     
 rt3469                         new     
 rt3517                         new     
-rt3746                         closed  marka
 rt3746_lidl                    new     
 rt4389                         new     
 rt4404                         new     
@@ -278,31 +205,19 @@ rt9442                            new
 rt9475                         new     
 rt9479                         new     
 rt9479_v9_2                    new     
-rt9940                         closed  
-rt9941                         closed  
 rt9976                         review  jakob
-rt9979                         closed  
-rt9989                         closed  
-rt9997                         closed  
-rt9997a                                closed  
-rt9998                         closed  
 skan                           new     
 skan-metazones1                        new     
-skan-tcr                       closed  
-skan-typecode-roll             closed  
-skan-typecode-roll2            closed  
 skan_implicit_update1          new     
 skan_stats1                    new     
 stats_lidl                     new     
 v6source                       new     
-v9_0                           closed  
-v9_1                           active  (security fixes only)
+v9_1                           active          (security fixes only)
 v9_1_1_base                    new     
 v9_1_1_patch                   new     
-v9_1_3_delegation_only         closed  
 v9_1_3_do_base                 new     
 v9_1_4_base                    new     
-v9_2                           active
+v9_2                           active  
 v9_2_0_patch                   new     
 v9_2_2_delegation_only         new     
 v9_2_2base                     new     
@@ -311,16 +226,13 @@ v9_3                              active
 v9_3_0base                     new     
 v9_3_0beta2_dlv                        new     
 v9_4                           active  
-ws20030120                     closed  (workshop branch)       
-ws20030120_tcr                 closed  (workshop branch)       
-ws20030312_optin               closed  (workshop branch)       
-ws20030312_tcr                 closed  (workshop branch)       
 
 
 a6_remove                      closed
 adb_race                       closed
 blabel-cleanup                 closed
 chroot                         closed
+delegation_only                        closed
 ds_12                          closed
 edns_size                      closed
 ifiter_getifaddrs              closed
@@ -330,9 +242,80 @@ ipv6-scope                 closed
 ipv6_6to4                      closed
 ksk                            closed
 marka_google                   closed
+rt10049                                closed
+rt10105                                closed
+rt10114                                closed
+rt10115                                closed
+rt10131                                closed
 rt10132                                closed
 rt10133                                closed
 rt10134                                closed
+rt10147                                closed
+rt10148                                closed
+rt10150                                closed
+rt10194                                closed
+rt10202                                closed
+rt10208                                closed
+rt10221                                closed
+rt10236                                closed
+rt10331                                closed
+rt10345                                closed
+rt10346                                closed
+rt10381                                closed
+rt10452                                closed
+rt10461                                closed
+rt10497                                closed
+rt10508                                closed
+rt10565                                closed
+rt10590                                closed
+rt10642                                closed
+rt10704                                closed
+rt10764                                closed          (empty)
+rt10838                                closed
+rt10847                                closed
+rt10861                                closed
+rt10920                                closed
+rt10925                                closed
+rt10929                                closed
+rt10991                                closed
+rt11013                                closed
+rt11065                                closed
+rt11101                                closed
+rt11116                                closed
+rt11117                                closed
+rt11118                                closed
+rt11119                                closed
+rt11127                                closed
+rt11132                                closed
+rt11149                                closed
+rt11177                                closed
+rt11179                                closed
+rt11208                                closed
+rt11237                                closed
+rt11280                                closed
+rt11288                                closed
+rt11331                                closed
+rt113347                       closed          (rt11347)
+rt11360                                closed
+rt11398                                closed
+rt11398b                       closed
+rt11398c                       closed
+rt11432                                closed
+rt11436                                closed
+rt11439                                closed
+rt11445                                closed
+rt11446                                closed
+rt11486                                closed
+rt11541                                closed
+rt11542                                closed
+rt11582                                closed
+rt11595                                closed
+rt11600                                closed
+rt11681                                closed
+rt11697                                closed
+rt11706                                closed
+rt11714                                closed
+rt11742                                closed
 rt3445                         closed
 rt3502                         closed
 rt3507                         closed          (pull down by explorer)
@@ -342,6 +325,7 @@ rt3598                              closed
 rt3625                         closed
 rt3653                         closed
 rt3666                         closed
+rt3746                         closed
 rt3892                         closed
 rt3907                         closed
 rt4090                         closed
@@ -370,4 +354,20 @@ rt5099                             closed
 rt5124                         closed
 rt5127                         closed
 rt7572                         closed
+rt9940                         closed
+rt9941                         closed
+rt9979                         closed
+rt9989                         closed
+rt9997                         closed
+rt9997a                                closed
+rt9998                         closed
+skan-tcr                       closed
+skan-typecode-roll             closed
+skan-typecode-roll2            closed
 slavefix                       closed
+v9_0                           closed
+v9_1_3_delegation_only         closed
+ws20030120                     closed          (workshop branch)
+ws20030120_tcr                 closed          (workshop branch)
+ws20030312_optin               closed          (workshop branch)
+ws20030312_tcr                 closed          (workshop branch)