From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 15 Jan 2013 13:50:38 +0000 (+0100)
Subject: [master] Added ChangeLog entry for #2317.
X-Git-Tag: bind10-1.0.0-rc-release~100^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d4b55818c8510a180889b157bfb360ef601af1b;p=thirdparty%2Fkea.git

[master] Added ChangeLog entry for #2317.
---

diff --git a/ChangeLog b/ChangeLog
index a103a7ac00..e9e2bd3fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+546.	[func]		marcin
+	DHCP option definitions can be now created using the
+	Configuration Manager. The option definition specifies
+	the option code, name and the types of the data being
+	carried by the option.  The Configuration Manager
+	reports an error on attempt to override standard DHCP
+	option definition.
+	(Trac #2317, git 71e25eb81e58a695cf3bad465c4254b13a50696e)
+
 545.	[func]		jinmei
 	libdns++: the SOA Rdata class now uses the generic lexer in
 	constructors from text.  This means that the MNAME and RNAME of an