[master] ChangeLog update after 3194 merge.

diff --git a/ChangeLog b/ChangeLog
index c4ad8abc10209c19f10e3041b0cb76a648a2582a..e5e0e5f8e1398cb73bf7dbe8872bb02ddfd5d78d 100644 (file)
--- 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.