BIND 10 master, updated. 6e0b7398570e219d417f991681f6d6428fb12a67 Merge remote branch 'origin/trac624'

[BIND 10 source code commits]

The branch, master has been updated
       via  6e0b7398570e219d417f991681f6d6428fb12a67 (commit)
       via  add0f697aec63c9af1df661951bda2ae007c98bf (commit)
      from  e8460092b6addf9ce69dddb49d80d91037178ba7 (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 6e0b7398570e219d417f991681f6d6428fb12a67
Merge: e846009 add0f69
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Feb 24 10:55:06 2011 -0800

    Merge remote branch 'origin/trac624'

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

Summary of changes:
 src/lib/asiolink/tests/udp_socket_unittest.cc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/tests/udp_socket_unittest.cc b/src/lib/asiolink/tests/udp_socket_unittest.cc
index 7332d29..3033857 100644
--- a/src/lib/asiolink/tests/udp_socket_unittest.cc
+++ b/src/lib/asiolink/tests/udp_socket_unittest.cc
@@ -257,9 +257,9 @@ TEST(UDPSocket, SequenceTest) {
     server.async_send_to(buffer(INBOUND_DATA, sizeof(INBOUND_DATA)),
         server_remote_endpoint.getASIOEndpoint(), server_cb);
 
-    // Expect two callbacks to run
-    service.get_io_service().poll();
-    //service.run_one();
+    // Expect the two callbacks to run
+    service.run_one();
+    service.run_one();
 
     EXPECT_TRUE(client_cb.getCalled());
     EXPECT_EQ(0, client_cb.getCode());