BIND 10 master, updated. b847ace0d4f3246335a5d4b8acb51eb24a10e468 [master] Corrected unit test in dhcp6

[BIND 10 source code commits]

The branch, master has been updated
       via  b847ace0d4f3246335a5d4b8acb51eb24a10e468 (commit)
      from  92e4a51039c3783141753e099e70dddf205ede93 (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 b847ace0d4f3246335a5d4b8acb51eb24a10e468
Author: Thomas Markwalder <tmark at isc.org>
Date:   Thu Feb 27 14:18:46 2014 -0500

    [master] Corrected unit test in dhcp6
    
    The unit test,  Dhcp6SrvD2Test.enableDisable, which was
    added with #3222 failed under FreeBSD.  The configuration
    string used for test was missing a required parameter.
    See Trac #3355 for a related change.

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

Summary of changes:
 src/bin/dhcp6/tests/d2_unittest.cc |    2 ++
 1 file changed, 2 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/d2_unittest.cc b/src/bin/dhcp6/tests/d2_unittest.cc
index d3cec74..73c718e 100644
--- a/src/bin/dhcp6/tests/d2_unittest.cc
+++ b/src/bin/dhcp6/tests/d2_unittest.cc
@@ -95,6 +95,8 @@ Dhcp6SrvD2Test::configureD2(bool enable_d2, const bool exp_result,
     std::ostringstream config;
     config <<
         "{ \"interfaces\": [ \"*\" ],"
+        "\"hooks-libraries\": [ ],"
+        "\"preferred-lifetime\": 3000,"
         "\"rebind-timer\": 2000, "
         "\"renew-timer\": 1000, "
         "\"subnet6\": [ { "