Merge branch 'v9_9' of ssh://repo/proj/git/prod/bind9 into v9_9

This commit is contained in:
Evan Hunt
2012-04-24 14:57:44 -07:00
2 changed files with 11 additions and 1 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# This file must follow /bin/sh rules. It is imported directly via
# configure.
#
SRCID="( 2012/04/23 00:15:00 UTC )"
SRCID="( 2012/04/24 00:15:00 UTC )"
+10
View File
@@ -515,6 +515,7 @@
./bin/tests/startperf/setup.sh SH 2011
./bin/tests/startperf/smallzone.db ZONE 2011
./bin/tests/sym_test.c C 1998,1999,2000,2001,2004,2005,2007
./bin/tests/system/.gitignore X 2012
./bin/tests/system/Makefile.in MAKE 2000,2001,2004,2007,2008,2010,2011
./bin/tests/system/README TXT.BRIEF 2000,2001,2004,2010,2011
./bin/tests/system/acl/clean.sh SH 2008
@@ -722,6 +723,7 @@
./bin/tests/system/dlvauto/ns2/named.conf CONF-C 2011
./bin/tests/system/dlvauto/setup.sh SH 2011
./bin/tests/system/dlvauto/tests.sh SH 2011
./bin/tests/system/dlz/.gitignore X 2012
./bin/tests/system/dlz/clean.sh SH 2010
./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.= TXT.BRIEF 2010
./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.= TXT.BRIEF 2010
@@ -735,6 +737,7 @@
./bin/tests/system/dlzexternal/dlopen.c C 2011
./bin/tests/system/dlzexternal/driver.c C 2011,2012
./bin/tests/system/dlzexternal/driver.h C 2011
./bin/tests/system/dlzexternal/ns1/.gitignore X 2012
./bin/tests/system/dlzexternal/ns1/named.conf.in CONF-C 2011
./bin/tests/system/dlzexternal/prereq.sh SH 2010,2011
./bin/tests/system/dlzexternal/setup.sh SH 2010
@@ -836,6 +839,7 @@
./bin/tests/system/edns/prereq.sh SH 2011
./bin/tests/system/edns/setup.sh SH 2011
./bin/tests/system/edns/tests.sh SH 2011
./bin/tests/system/filter-aaaa/.gitignore X 2012
./bin/tests/system/filter-aaaa/Makefile.in MAKE 2010,2011
./bin/tests/system/filter-aaaa/clean.sh SH 2010
./bin/tests/system/filter-aaaa/conf/bad1.conf CONF-C 2010
@@ -898,6 +902,7 @@
./bin/tests/system/glue/tests.sh SH 2000,2001,2003,2004,2007
./bin/tests/system/glue/xx.good X 2000,2001
./bin/tests/system/glue/yy.good X 2000,2001,2003
./bin/tests/system/gost/.gitignore X 2012
./bin/tests/system/gost/clean.sh SH 2010
./bin/tests/system/gost/ns1/named.conf CONF-C 2010
./bin/tests/system/gost/ns1/root.db.in ZONE 2010
@@ -928,12 +933,14 @@
./bin/tests/system/ixfr/ans2/startme X 2011
./bin/tests/system/ixfr/clean.sh SH 2001,2004,2007,2011,2012
./bin/tests/system/ixfr/ns1/.gitignore X 2012
./bin/tests/system/ixfr/ns3/.gitignore X 2012
./bin/tests/system/ixfr/ns3/mytest0.db ZONE 2011
./bin/tests/system/ixfr/ns3/mytest1.db ZONE 2011
./bin/tests/system/ixfr/ns3/mytest2.db ZONE 2011
./bin/tests/system/ixfr/ns3/named.conf CONF-C 2011
./bin/tests/system/ixfr/ns3/subtest0.db ZONE 2011
./bin/tests/system/ixfr/ns3/subtest1.db ZONE 2011
./bin/tests/system/ixfr/ns4/.gitignore X 2012
./bin/tests/system/ixfr/ns4/named.conf CONF-C 2011
./bin/tests/system/ixfr/prereq.sh SH 2001,2004,2007
./bin/tests/system/ixfr/setup.sh SH 2001,2004,2007,2011,2012
@@ -1112,6 +1119,7 @@
./bin/tests/system/rndc/ns2/named.conf CONF-C 2011
./bin/tests/system/rndc/setup.sh SH 2011
./bin/tests/system/rndc/tests.sh SH 2011
./bin/tests/system/rpz/.gitignore X 2012
./bin/tests/system/rpz/Makefile.in MAKE 2011
./bin/tests/system/rpz/clean.sh SH 2011,2012
./bin/tests/system/rpz/ns1/named.conf CONF-C 2011
@@ -1301,11 +1309,13 @@
./bin/tests/system/views/clean.sh SH 2000,2001,2004,2005,2007
./bin/tests/system/views/ns1/named.conf CONF-C 2000,2001,2004,2007
./bin/tests/system/views/ns1/root.db ZONE 2000,2001,2004,2007
./bin/tests/system/views/ns2/.gitignore X 2012
./bin/tests/system/views/ns2/example1.db ZONE 2000,2001,2004,2007
./bin/tests/system/views/ns2/example2.db ZONE 2000,2001,2004,2007
./bin/tests/system/views/ns2/internal.db ZONE 2000,2001,2004,2007
./bin/tests/system/views/ns2/named1.conf CONF-C 2000,2001,2004,2007
./bin/tests/system/views/ns2/named2.conf CONF-C 2000,2001,2004,2007
./bin/tests/system/views/ns3/.gitignore X 2012
./bin/tests/system/views/ns3/internal.db ZONE 2000,2001,2004,2007
./bin/tests/system/views/ns3/named1.conf CONF-C 2000,2001,2004,2007
./bin/tests/system/views/ns3/named2.conf CONF-C 2000,2001,2004,2007