From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 1 Dec 2015 19:12:22 +0000 (+0100)
Subject: [master] ChangeLog updated after 4121 merge.
X-Git-Tag: trac4231_base~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd4942ffa32fbca8b19622e014a85788a9d2e40e;p=thirdparty%2Fkea.git

[master] ChangeLog updated after 4121 merge.
---

diff --git a/ChangeLog b/ChangeLog
index f392288ae8..2df275aa15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1064.	[func]		fdupont,tomek
+	The DHCPv4 server now stores Relay Agent Information option as
+	the last one.
+	(trac #4121, git 2f883d4afb9b27c6c59d993692370685b206b6c2)
+
 1063.	[doc]		tmark
 	Added Kea logo to documentation.
 	(trac #3702, git 7cae813ffe9a7320db5c84ac4beb1c3c0ecabbf7)