BIND 10 master, updated. 7a74c2d58e76b8fcc9aea301bd4ea42a0269aca8 [master] Merge branch 'trac1535'

[BIND 10 source code commits]

The branch, master has been updated
       via  7a74c2d58e76b8fcc9aea301bd4ea42a0269aca8 (commit)
       via  bbe403303f87ef541114aceaa0aba02d2df714b4 (commit)
       via  70515e4857db49a5d2cec93f00839ce2cf1ea52d (commit)
      from  7733a51887b6370c92cfb02a2446b10d15e224dc (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 7a74c2d58e76b8fcc9aea301bd4ea42a0269aca8
Merge: 7733a51 bbe4033
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Apr 2 13:38:28 2012 -0700

    [master] Merge branch 'trac1535'

commit bbe403303f87ef541114aceaa0aba02d2df714b4
Merge: 70515e4 952cb2c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Apr 2 13:31:10 2012 -0700

    [1535] Merge branch 'trac1535' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1535

commit 70515e4857db49a5d2cec93f00839ce2cf1ea52d
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 30 11:14:06 2012 -0700

    [1535] (editorial) combined two shorter lines into one.

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

Summary of changes:
 src/lib/datasrc/tests/database_unittest.cc |    9 +++------
 src/lib/python/isc/datasrc/datasrc.cc      |    3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index af64f58..0e9c924 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -1881,10 +1881,8 @@ TYPED_TEST(DatabaseClientTest, findOutOfZone) {
     EXPECT_THROW(finder->findAll(Name("org"), target), OutOfZone);
 
     // sharing a common ancestor
-    EXPECT_THROW(finder->find(Name("noexample.org"), this->qtype_),
-                 OutOfZone);
-    EXPECT_THROW(finder->findAll(Name("noexample.org"), target),
-                 OutOfZone);
+    EXPECT_THROW(finder->find(Name("noexample.org"), this->qtype_), OutOfZone);
+    EXPECT_THROW(finder->findAll(Name("noexample.org"), target), OutOfZone);
 
     // totally unrelated domain, smaller number of labels
     EXPECT_THROW(finder->find(Name("com"), this->qtype_), OutOfZone);
@@ -1897,8 +1895,7 @@ TYPED_TEST(DatabaseClientTest, findOutOfZone) {
     // totally unrelated domain, larger number of labels
     EXPECT_THROW(finder->find(Name("more.example.com"), this->qtype_),
                  OutOfZone);
-    EXPECT_THROW(finder->findAll(Name("more.example.com"), target),
-                 OutOfZone);
+    EXPECT_THROW(finder->findAll(Name("more.example.com"), target), OutOfZone);
 }
 
 TYPED_TEST(DatabaseClientTest, findDelegation) {
diff --git a/src/lib/python/isc/datasrc/datasrc.cc b/src/lib/python/isc/datasrc/datasrc.cc
index af6c21e..f31d10a 100644
--- a/src/lib/python/isc/datasrc/datasrc.cc
+++ b/src/lib/python/isc/datasrc/datasrc.cc
@@ -288,8 +288,7 @@ PyInit_datasrc(void) {
         po_DataSourceError = PyErr_NewException("isc.datasrc.Error", NULL,
                                                 NULL);
         PyObjectContainer(po_DataSourceError).installToModule(mod, "Error");
-        po_OutOfZone = PyErr_NewException("isc.datasrc.OutOfZone", NULL,
-                                          NULL);
+        po_OutOfZone = PyErr_NewException("isc.datasrc.OutOfZone", NULL, NULL);
         PyObjectContainer(po_OutOfZone).installToModule(mod, "OutOfZone");
         po_NotImplemented = PyErr_NewException("isc.datasrc.NotImplemented",
                                                NULL, NULL);