From: Jelte Jansen <jelte@isc.org>
Date: Wed, 7 Mar 2012 17:50:20 +0000 (+0100)
Subject: [master] update changelog for #1093 and #1741
X-Git-Tag: trac2351_base~226^2~116^2~41^2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a82ece4c4e353ab8e3ceb01fd8e0f4824ac6bbf;p=thirdparty%2Fkea.git

[master] update changelog for #1093 and #1741
---

diff --git a/ChangeLog b/ChangeLog
index 2c2a37b087..50cf70591b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+395.	[bug]		jelte
+	The log message compiler now errors (resulting in build failures) if
+	duplicate log message identifiers are found in a single message file.
+	Renamed one duplicate that was found (RESOLVER_SHUTDOWN, renamed to
+	RESOLVER_SHUTDOWN_RECEIVED).
+	(Trac #1093, git f537c7e12fb7b25801408f93132ed33410edae76)
+	(Trac #1741, git b8960ab85c717fe70ad282e0052ac0858c5b57f7)
+
 394.	[bug]		jelte
 	b10-auth now catches any exceptions during response building; if any
 	datasource either throws an exception or causes an exception to be