[master] Finished merge of trac4015 (secure DHCPv6 definitions)

diff --git a/ChangeLog b/ChangeLog
index d0bb0d60750d0e97b1fb5c571debebaccbc5ffc3..c1a828ccbc597b02bf10f7e0593f642a447062e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1011.  [func]          fdupont
+       Added definitions and tests for the options from secure DHCPv6.
+       This protocol is still experimental. The option and other protocol
+       codes are for testing, they will be updated when IANA assigns
+       official values.
+       (Trac #4015, git xxx)
+
 1010.  [bug]           tmark
        Fixed test failures occuring for some tests after
        IfaceMgr::closeSockets was called.