BIND 10 master, updated. bd8497df6615f58b2a6de701cf2a8f02c4d57d9b [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  bd8497df6615f58b2a6de701cf2a8f02c4d57d9b (commit)
       via  57b40ee87d9689e6479d7fe4a2cf9903db3a3644 (commit)
      from  2156cc8503238162e22f418632837003593c8e3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd8497df6615f58b2a6de701cf2a8f02c4d57d9b
Merge: 57b40ee 2156cc8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 19 09:25:58 2012 -0800

    [master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 57b40ee87d9689e6479d7fe4a2cf9903db3a3644
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Dec 19 09:25:23 2012 -0800

    [master] disabled bindctl system test, referring to #2568.

-----------------------------------------------------------------------

Summary of changes:
 tests/system/conf.sh.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/tests/system/conf.sh.in b/tests/system/conf.sh.in
index 92f72fa..4948d63 100755
--- a/tests/system/conf.sh.in
+++ b/tests/system/conf.sh.in
@@ -51,7 +51,10 @@ export RNDC=$BIND9_TOP/bin/rndc/rndc
 export TESTSOCK=$BIND9_TOP/bin/tests/system/testsock.pl
 export DIGCOMP=$BIND9_TOP/bin/tests/system/digcomp.pl
 
-export SUBDIRS="bindctl glue ixfr/in-2"
+# bindctl test doesn't work right now and is disabled (see #2568)
+#export SUBDIRS="bindctl glue ixfr/in-2"
+export SUBDIRS="glue ixfr/in-2"
+
 # Add appropriate subdirectories to the above statement as the tests become
 # available.
 #SUBDIRS="dnssec masterfile ixfr/in-1 ixfr/in-2 ixfr/in-4"