BIND 10 master, updated. 5b41c700bd362d76ce19b032c75662f64b5a9ca8 [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  5b41c700bd362d76ce19b032c75662f64b5a9ca8 (commit)
       via  8f594ed3b5bcd0d29c1ddb2fcc0f91854503606e (commit)
      from  3a7fba8e0764537e4782b8625b548bd199e30e28 (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 5b41c700bd362d76ce19b032c75662f64b5a9ca8
Merge: 8f594ed 3a7fba8
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Jun 18 18:54:29 2013 +0900

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

commit 8f594ed3b5bcd0d29c1ddb2fcc0f91854503606e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Jun 18 18:53:35 2013 +0900

    [master] removed an unused function. needed for it to compile with clang++.
    
    okayed on jabber.

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

Summary of changes:
 src/lib/util/tests/handles_unittest.cc |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/tests/handles_unittest.cc b/src/lib/util/tests/handles_unittest.cc
index 22ac88d..5e5b237 100644
--- a/src/lib/util/tests/handles_unittest.cc
+++ b/src/lib/util/tests/handles_unittest.cc
@@ -523,12 +523,7 @@ TEST_F(HandlesTest, ContextDeletionCheck) {
 
 // Tests that the CalloutHandle's constructor and destructor call the
 // context_create and context_destroy callbacks (if registered).  For
-// simplicity, we'll use the same callout functions as used above, plus
-// the following that returns an error:
-
-int returnError(CalloutHandle&) {
-    return (1);
-}
+// simplicity, we'll use the same callout functions as used above.
 
 TEST_F(HandlesTest, ConstructionDestructionCallouts) {