BIND 10 master, updated. 0ecb807011196eac01f281d40bc7c9d44565b364 Merge branch 'trac620'

[BIND 10 source code commits]

The branch, master has been updated
       via  0ecb807011196eac01f281d40bc7c9d44565b364 (commit)
       via  5a4d69114ef60bbb86c4fc2190b78761ac4ccc3f (commit)
       via  776f5ebd79615b0c05f2009c09bf61c44c59343a (commit)
      from  fa321eca22c746101dd9cf67c7bc9da6de30483a (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 0ecb807011196eac01f281d40bc7c9d44565b364
Merge: fa321eca22c746101dd9cf67c7bc9da6de30483a 5a4d69114ef60bbb86c4fc2190b78761ac4ccc3f
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Fri May 6 10:53:00 2011 +0900

    Merge branch 'trac620'
    
    Conflicts:
    	ChangeLog

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

Summary of changes:
 ChangeLog                  |    6 ++++++
 src/bin/auth/statistics.cc |    4 ----
 src/bin/stats/stats.py.in  |    3 ---
 3 files changed, 6 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index e1e23e7..e139e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+230.	[bug]		naokikambe
+	Removed too repeated verbose messages in two cases of:
+	 - when auth sends statistics data to stats
+	 - when stats receives statistics data from other modules
+	(Trac#620, git #TBD)
+
 229.	[doc]		jreed
 	Add manual page for b10-host.
 	(git a437d4e26b81bb07181ff35a625c540703eee845)
diff --git a/src/bin/auth/statistics.cc b/src/bin/auth/statistics.cc
index e68793c..415aa14 100644
--- a/src/bin/auth/statistics.cc
+++ b/src/bin/auth/statistics.cc
@@ -91,10 +91,6 @@ AuthCountersImpl::submitStatistics() const {
         const int seq =
             statistics_session_->group_sendmsg(statistics_element, "Stats");
         isc::data::ConstElementPtr env, answer;
-        if (verbose_mode_) {
-            std::cerr << "[b10-auth] "
-                      << "send statistics data" << std::endl;
-        }
         // TODO: parse and check response from statistics module
         // currently it just returns empty message
         statistics_session_->group_recvmsg(env, answer, false, seq);
diff --git a/src/bin/stats/stats.py.in b/src/bin/stats/stats.py.in
index dd617f8..821a719 100644
--- a/src/bin/stats/stats.py.in
+++ b/src/bin/stats/stats.py.in
@@ -276,9 +276,6 @@ class CCSessionListener(Listener):
         """
         handle set command
         """
-        if self.verbose:
-            sys.stdout.write("[b10-stats] 'set' command received, args: "+str(args)+"\n")
-
         # 'args' must be dictionary type
         self.stats_data.update(args['stats_data'])