BIND 10 master, updated. 5ffee903b4e48f34c363215668d3867c0a7f6c94 [1885] Add ChangeLog entry

[BIND 10 source code commits]

The branch, master has been updated
       via  5ffee903b4e48f34c363215668d3867c0a7f6c94 (commit)
       via  95947109c58b1e099ee5c4e955f739213824e49f (commit)
       via  5c8bbd7ab648b6b7c48e366e7510dedca5386f6c (commit)
      from  653847cf994c75cacd23df1ae0e5c9002cf338c4 (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 5ffee903b4e48f34c363215668d3867c0a7f6c94
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu May 3 09:20:16 2012 +0530

    [1885] Add ChangeLog entry

commit 95947109c58b1e099ee5c4e955f739213824e49f
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue May 1 16:39:07 2012 +0530

    [1885] Fix lettuce tests, now that b10-stats-httpd isn't enabled by default

commit 5c8bbd7ab648b6b7c48e366e7510dedca5386f6c
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue May 1 16:34:27 2012 +0530

    [1885] Turn off b10-stats-httpd in the default configuration

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

Summary of changes:
 ChangeLog                              |    4 ++++
 doc/guide/bind10-guide.xml             |    5 ++---
 src/bin/bind10/bind10.xml              |    4 ----
 src/bin/bind10/bob.spec                |    4 ----
 tests/lettuce/features/default.feature |    3 +--
 5 files changed, 7 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 21268c1..63b14aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+431.	[func]*         muks
+	BIND 10 no longer starts b10-stats-httpd by default.
+	(Trac #1885, git 5c8bbd7ab648b6b7c48e366e7510dedca5386f6c)
+
 430.	[bug]		jelte
 	When displaying configuration data, bindctl no longer treats
 	optional list items as an error, but shows them as an empty list.
diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index a1c6399..630c0c4 100644
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -770,9 +770,8 @@ as a dependency earlier -->
       In its default configuration, the <command>bind10</command>
       master process will also start up
       <command>b10-cmdctl</command> for administration tools to
-      communicate with the system,
-      <command>b10-stats</command> for statistics collection, and
-      <command>b10-stats-httpd</command> for statistics reporting.
+      communicate with the system, and
+      <command>b10-stats</command> for statistics collection.
     </para>
 
     <section id="start">
diff --git a/src/bin/bind10/bind10.xml b/src/bin/bind10/bind10.xml
index 9a8f2fe..2501fee 100644
--- a/src/bin/bind10/bind10.xml
+++ b/src/bin/bind10/bind10.xml
@@ -251,10 +251,6 @@ TODO: configuration section
         <para> <varname>/Boss/components/b10-stats</varname> </para>
       </listitem>
 
-      <listitem>
-        <para> <varname>/Boss/components/b10-stats-httpd</varname> </para>
-      </listitem>
-
     </itemizedlist>
 
     <para>
diff --git a/src/bin/bind10/bob.spec b/src/bin/bind10/bob.spec
index b358f96..8b75640 100644
--- a/src/bin/bind10/bob.spec
+++ b/src/bin/bind10/bob.spec
@@ -9,10 +9,6 @@
         "item_optional": false,
         "item_default": {
           "b10-stats": { "address": "Stats", "kind": "dispensable" },
-          "b10-stats-httpd": {
-            "address": "StatsHttpd",
-            "kind": "dispensable"
-          },
           "b10-cmdctl": { "special": "cmdctl", "kind": "needed" }
         },
         "named_set_item_spec": {
diff --git a/tests/lettuce/features/default.feature b/tests/lettuce/features/default.feature
index daace57..ce7ee1e 100644
--- a/tests/lettuce/features/default.feature
+++ b/tests/lettuce/features/default.feature
@@ -6,13 +6,11 @@ Feature: default bind10 config
     And wait for bind10 stderr message BIND10_STARTED_CC
     And wait for bind10 stderr message CMDCTL_STARTED
     And wait for bind10 stderr message STATS_STARTING
-    And wait for bind10 stderr message STATHTTPD_STARTED
 
     # These should be running
     bind10 module Boss should be running
     And bind10 module Logging should be running
     And bind10 module Stats should be running
-    And bind10 module StatsHttpd should be running
 
     # These should not be running
     bind10 module Resolver should not be running
@@ -20,3 +18,4 @@ Feature: default bind10 config
     And bind10 module Zonemgr should not be running
     And bind10 module Xfrin should not be running
     And bind10 module Auth should not be running
+    And bind10 module StatsHttpd should not be running