From: Francis Dupont <fdupont@isc.org>
Date: Wed, 8 Jun 2016 14:18:26 +0000 (+0200)
Subject: [master] Finished merge of trac4106 (DHCPv4-over-DHCPv6 IPC)
X-Git-Tag: trac4106_update_base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3223bb8280bfd99c225e725de660ae764abe3c87;p=thirdparty%2Fkea.git

[master] Finished merge of trac4106 (DHCPv4-over-DHCPv6 IPC)
---

diff --git a/ChangeLog b/ChangeLog
index e2e42e45d2..ab720ca42c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1125.	[func]		fdupont
+	Inter-process communication for exchanging packets between
+	DHCPv4 and DHCPv6 components of DHCPv4-over-DHCPv6 has been
+	implemented.
+	(Trac #4106, git xxx)
+
 1124.	[bug]		sar
 	Update the classification document to match the output from
 	the debug statements.