BIND 10 master, updated. c12cdc5ffe704bca024a84223774871e5049f90f [master] fixed conflicts in changelog (due to me forgetting push?)

[BIND 10 source code commits]

The branch, master has been updated
       via  c12cdc5ffe704bca024a84223774871e5049f90f (commit)
       via  1202e2c13c17c4e3013c635f9e4ef8629c9c7b69 (commit)
       via  fa862e7d1208c8cd0526b9512b9a1979366252ba (commit)
      from  13fe9c1bdcc2e0a1c8947a328429e6f301c6fb3e (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 c12cdc5ffe704bca024a84223774871e5049f90f
Merge: 1202e2c 13fe9c1
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 2 10:08:38 2012 -0800

    [master] fixed conflicts in changelog (due to me forgetting push?)

commit 1202e2c13c17c4e3013c635f9e4ef8629c9c7b69
Merge: fa862e7 ea85b4a
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Thu Mar 1 09:35:10 2012 -0800

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

commit fa862e7d1208c8cd0526b9512b9a1979366252ba
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Feb 29 13:41:08 2012 -0800

    [master] added changelog entry for #1697

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

Summary of changes:
 ChangeLog            |   14 +++++++++++---
 src/bin/auth/main.cc |    5 ++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index e48d86b..fd23fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,17 @@
+392.	[func]*		jinmei
+	libdns++: revised the (Abstract)MessageRenderer class so that it
+	has a default internal buffer and the buffer can be temporarily
+	switched.  The constructor interface was modified, and a new
+	method setBuffer() was added.
+	(Trac #1697, git 9cabc799f2bf9a3579dae7f1f5d5467c8bb1aa40)
+
 391.	[bug]*		vorner
 	The long time unused configuration options of Xfrout "log_name",
 	"log_file", "log_severity", "log_version" and "log_max_bytes" were
-	removed, as they had no effect (Xfrout uses the global logging framework).
-	However, if you have them set, you need to remove them from the
-	configuration file or the configuration will be rejected.
+	removed, as they had no effect (Xfrout uses the global logging
+	framework).  However, if you have them set, you need to remove
+	them from the configuration file or the configuration will be
+	rejected.
 	(Trac #1090, git ef1eba02e4cf550e48e7318702cff6d67c1ec82e)
 
 bind10-devel-20120301 released on March 1, 2012
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index fc2f751..0db770c 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -25,6 +25,8 @@
 #include <cassert>
 #include <iostream>
 
+#include <boost/lexical_cast.hpp>
+
 #include <exceptions/exceptions.h>
 
 #include <util/buffer.h>
@@ -116,7 +118,8 @@ main(int argc, char* argv[]) {
     }
 
     // Initialize logging.  If verbose, we'll use maximum verbosity.
-    isc::log::initLogger(AUTH_NAME,
+    isc::log::initLogger(string(AUTH_NAME) + " (" +
+                         boost::lexical_cast<string>(getpid()) + ")",
                          (verbose ? isc::log::DEBUG : isc::log::INFO),
                          isc::log::MAX_DEBUG_LEVEL, NULL);