From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 25 Oct 2013 10:32:10 +0000 (+0200)
Subject: [master] ChangeLog update after 3194 merge.
X-Git-Tag: bind10-1.2.0beta1-release~102^2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dbe0c8aa52634f064b285c8133255abd28cf324;p=thirdparty%2Fkea.git

[master] ChangeLog update after 3194 merge.
---

diff --git a/ChangeLog b/ChangeLog
index c4ad8abc10..e5e0e5f8e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+700.	[func]		tomek,marcin
+	b10-dhcp4,b10-dhcp6: Support for vendor options has been added. It
+	is now possible to configure vendor options. Server is able to
+	parse some CableLabs vendor options and send configured	vendor
+	options	in response. The support is not complete.
+	(Trac #3194, git 243ded15bbed0d35e230d00f4e3ee42c3609616c)
+
 699.	[bug]		marcin
 	libdhcp++: Options with defined suboptions are now handled properly.
 	In particular, Relay Agent Info options is now echoed back properly.