BIND 10 master, updated. 75b6a1057c947a2aa8d2103e6dfb3cee65823d0f [master] Merge branch 'trac3245'

[BIND 10 source code commits]

The branch, master has been updated
       via  75b6a1057c947a2aa8d2103e6dfb3cee65823d0f (commit)
       via  e3bd56e78491b018a3eb17f2baaa9fe0cf40919d (commit)
      from  43c5b414355bf16d31826aeb633ba68f68564848 (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 75b6a1057c947a2aa8d2103e6dfb3cee65823d0f
Merge: 43c5b41 e3bd56e
Author: Marcin Siodelski <marcin at isc.org>
Date:   Thu Jan 23 17:42:40 2014 +0100

    [master] Merge branch 'trac3245'

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

Summary of changes:
 src/bin/d2/dns_client.h |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/d2/dns_client.h b/src/bin/d2/dns_client.h
index 5960f6a..54d6a6a 100644
--- a/src/bin/d2/dns_client.h
+++ b/src/bin/d2/dns_client.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2014 Internet Systems Consortium, Inc. ("ISC")
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -143,8 +143,8 @@ public:
     /// @param ns_addr DNS server address.
     /// @param ns_port DNS server port.
     /// @param update A DNS Update message to be sent to the server.
-    /// @param wait A timeout (in seconds) for the response. If a response is
-    /// not received within the timeout, exchange is interrupted. This value
+    /// @param wait A timeout (in milliseconds) for the response. If a response
+    /// is not received within the timeout, exchange is interrupted. This value
     /// must not exceed maximal value for 'int' data type.
     /// @param tsig_key An @c isc::dns::TSIGKey object representing TSIG
     /// context which will be used to render the DNS Update message.
@@ -173,8 +173,8 @@ public:
     /// @param ns_addr DNS server address.
     /// @param ns_port DNS server port.
     /// @param update A DNS Update message to be sent to the server.
-    /// @param wait A timeout (in seconds) for the response. If a response is
-    /// not received within the timeout, exchange is interrupted. This value
+    /// @param wait A timeout (in milliseconds) for the response. If a response
+    /// is not received within the timeout, exchange is interrupted. This value
     /// must not exceed maximal value for 'int' data type.
     void doUpdate(asiolink::IOService& io_service,
                   const asiolink::IOAddress& ns_addr,