BIND 10 master, updated. f85cdd324c2d51046c2030587d8d5053b4a0ebbd Merge branch 'trac2832'

[BIND 10 source code commits]

The branch, master has been updated
       via  f85cdd324c2d51046c2030587d8d5053b4a0ebbd (commit)
       via  754c38ee58da3a9d9667072c16b58ab53d45e368 (commit)
       via  946b1dfec880e605bc154bc963f4b3bd860c1b55 (commit)
       via  9a160a14fcb4d4b781ee79fdd4aa60f8e56918b3 (commit)
      from  74b59ef97880f4bba6e660b32c45fb1a8027c727 (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 f85cdd324c2d51046c2030587d8d5053b4a0ebbd
Merge: 74b59ef 754c38e
Author: Paul Selkirk <pselkirk at isc.org>
Date:   Fri Apr 12 23:40:15 2013 -0400

    Merge branch 'trac2832'

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

Summary of changes:
 src/bin/cfgmgr/plugins/datasrc.spec.pre.in |    6 ++++++
 src/lib/datasrc/cache_config.cc            |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/plugins/datasrc.spec.pre.in b/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
index eac14c4..3f16758 100644
--- a/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
+++ b/src/bin/cfgmgr/plugins/datasrc.spec.pre.in
@@ -68,6 +68,12 @@
                                 "item_name": "name",
                                 "item_type": "string",
                                 "item_optional": true
+                            },
+                            {
+                                "item_name": "cache-type",
+                                "item_type": "string",
+                                "item_optional": true,
+                                "item_default": "local"
                             }
                         ]
                     }
diff --git a/src/lib/datasrc/cache_config.cc b/src/lib/datasrc/cache_config.cc
index 9cfe3b1..378e5e6 100644
--- a/src/lib/datasrc/cache_config.cc
+++ b/src/lib/datasrc/cache_config.cc
@@ -37,7 +37,7 @@ getEnabledFromConf(const Element& conf) {
 
 std::string
 getSegmentTypeFromConf(const Element& conf) {
-    // If cache-zones is not explicitly configured, use the default type.
+    // If cache-type is not explicitly configured, use the default type.
     // (Ideally we should retrieve the default from the spec).
     if (!conf.contains("cache-type")) {
         return ("local");