BIND 10 master, updated. 9c9e6fb55c3245cbd6e17e372b635930b62e32c8 [master] Add ChangeLog entry for #2756

[BIND 10 source code commits]

The branch, master has been updated
       via  9c9e6fb55c3245cbd6e17e372b635930b62e32c8 (commit)
       via  56681a342d6775e1ca3b6106319af73296e790aa (commit)
       via  31872754f36c840b4ec0b412a86afe9f38be86e0 (commit)
       via  7bfadaf4d1e916aeddaf4cc17680fb0f71511b4e (commit)
      from  06b32bac47c7571281fa9bbcd88017c1b3fd0e48 (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 9c9e6fb55c3245cbd6e17e372b635930b62e32c8
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Jan 30 11:02:51 2014 +0530

    [master] Add ChangeLog entry for #2756

commit 56681a342d6775e1ca3b6106319af73296e790aa
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Jan 30 11:00:03 2014 +0530

    [master] Reformat last ChangeLog entry

commit 31872754f36c840b4ec0b412a86afe9f38be86e0
Merge: 06b32ba 7bfadaf
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Jan 30 10:58:12 2014 +0530

    Merge branch 'trac2756'

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

Summary of changes:
 ChangeLog                       |   10 ++++++++--
 src/lib/datasrc/cache_config.cc |    6 ++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 354a102..23b3b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
-741.    [bug]       shane
-	Remove hard-coded (and unnecessary) TSIG key from error message. 
+742.	[func]		muks
+	The authoritative server now includes the datasource configuration
+	when logging some errors with the
+	AUTH_DATASRC_CLIENTS_BUILDER_RECONFIGURE_ERROR message ID.
+	(Trac #2756, git 31872754f36c840b4ec0b412a86afe9f38be86e0)
+
+741.	[bug]		shane
+	Remove hard-coded (and unnecessary) TSIG key from error message.
 	This also prevents a crash if the TSIG name is missing.
 	(Trac #3099, git 0ba8bbabe09756a4627e80aacdbb5050407faaac)
 
diff --git a/src/lib/datasrc/cache_config.cc b/src/lib/datasrc/cache_config.cc
index ec3cfeb..9a44900 100644
--- a/src/lib/datasrc/cache_config.cc
+++ b/src/lib/datasrc/cache_config.cc
@@ -75,7 +75,8 @@ CacheConfig::CacheConfig(const std::string& datasrc_type,
 
         if (!enabled_) {
             isc_throw(CacheConfigError,
-                      "The cache must be enabled for the MasterFiles type");
+                      "The cache must be enabled for the MasterFiles type: "
+                      << datasrc_conf);
         }
 
         typedef std::map<std::string, ConstElementPtr> ZoneToFile;
@@ -100,7 +101,8 @@ CacheConfig::CacheConfig(const std::string& datasrc_type,
         if (!datasrc_conf.contains("cache-zones")) {
             isc_throw(NotImplemented, "Auto-detection of zones "
                       "to cache is not yet implemented, supply "
-                      "cache-zones parameter");
+                      "cache-zones parameter: "
+                      << datasrc_conf);
             // TODO: Auto-detect list of all zones in the
             // data source.
         }