From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 18 Nov 2015 12:27:27 +0000 (-0500)
Subject: [master] Added Changelog entry 1050 for #4117.
X-Git-Tag: trac4203_base
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2bcf4e9bb326c57f63eb866c678b43202ec151;p=thirdparty%2Fkea.git

[master] Added Changelog entry 1050 for #4117.
---

diff --git a/ChangeLog b/ChangeLog
index 02196190d1..41eb629c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1050.   [doc]     [tmark]
+	Corrected the descriptions of ncr-protocol and ncr-format parameters
+	in the Kea Admin Guide.
+	(Trac #4117    git 034c1c95b57768d5abbc7fb40cc57d7cadad21dd)
+
 1049.	[build]		fdupont
 	Add a new --enable-generate-parser configuration parameter
 	(disabled by default) which makes flex and bison to regenerate