BIND 10 master, updated. ae199c79e42520e8e521668c6f9435796ca92aa3 Merge branch 'master' into trac1318

[BIND 10 source code commits]

The branch, master has been updated
       via  ae199c79e42520e8e521668c6f9435796ca92aa3 (commit)
       via  ad24f1d258542fecf0e83187f6ed5cc8cdce8ca2 (commit)
      from  541ea699442bece13605d34e182ff89bca384a43 (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 ae199c79e42520e8e521668c6f9435796ca92aa3
Merge: ad24f1d258542fecf0e83187f6ed5cc8cdce8ca2 541ea699442bece13605d34e182ff89bca384a43
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Oct 19 16:14:54 2011 +0100

    Merge branch 'master' into trac1318

commit ad24f1d258542fecf0e83187f6ed5cc8cdce8ca2
Author: Stephen Morris <stephen at isc.org>
Date:   Tue Oct 18 18:33:30 2011 +0100

    [1318] Correct problem in #1213 update
    
    1213 failed to take into account a change in zone configuration
    options, causing the IXFR-in test to fail.

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

Summary of changes:
 tests/system/ixfr/b10-config.db.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/system/ixfr/b10-config.db.in b/tests/system/ixfr/b10-config.db.in
index f83a672..946d80f 100644
--- a/tests/system/ixfr/b10-config.db.in
+++ b/tests/system/ixfr/b10-config.db.in
@@ -3,7 +3,8 @@
         "zones": [{
             "master_addr": "10.53.0.1",
             "master_port": 53210,
-            "name": "example."
+            "name": "example.",
+            "use_ixfr": true
         }]
     },
     "Auth": {