From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 19 Jan 2015 13:35:46 +0000 (+0100)
Subject: [master] ChangeLog updated after #3553 merge.
X-Git-Tag: trac3712_base~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35be7340431aa05b9b7bc8ca7c1178c6f8dce5d7;p=thirdparty%2Fkea.git

[master] ChangeLog updated after #3553 merge.
---

diff --git a/ChangeLog b/ChangeLog
index 94f0d1a939..3ff2f99e94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+876.   [func]          tomek
+       Two new MAC aquisition methods implemented for DHCPv6:
+       docsis-modem (which extracts MAC address from an option inserted
+       by a cable modem) and docsis-ctms (which extracts MAC address from
+       an option inserted by CMTS which acts as a DHCPv6 relay agent).
+       (Trac #3553, git ad0a3772774bc5f9831a5ba16725a5a22887b8cb)
+
 875.    [bug]           afidalgo, marcin
 	The DHCPv4 server no longer appends the trailing dot to the
 	hostnames sent to the clients in the Hostname option (12).