BIND 10 master, updated. 699b22f297cee0d8ee81736b0424c785109d3e13 [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  699b22f297cee0d8ee81736b0424c785109d3e13 (commit)
       via  041dbdee3f1ab76ddb427cd9029fb1a827f365bd (commit)
      from  31c9326b6f87c7bc02fd8d37baab36f05c220f6f (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 699b22f297cee0d8ee81736b0424c785109d3e13
Merge: 041dbde 31c9326
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Tue Sep 18 12:51:10 2012 -0500

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

commit 041dbdee3f1ab76ddb427cd9029fb1a827f365bd
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Tue Sep 18 12:50:08 2012 -0500

    [master] fix spelling typo in output
    
    I didn't get this reviewed, but make check still worked for me.

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

Summary of changes:
 src/lib/dhcp/tests/iface_mgr_unittest.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 3bf5ca4..4fe7e23 100644
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -1180,7 +1180,7 @@ TEST_F(IfaceMgrTest, DISABLED_detectIfaces_linux) {
                          << " address on " << detected->getFullName() << " interface." << endl;
                     FAIL();
                 }
-                cout << "Address " << addr->toText() << " on iterface " << detected->getFullName()
+                cout << "Address " << addr->toText() << " on interface " << detected->getFullName()
                      << " matched with 'ifconfig -a' output." << endl;
             }
         }