From: Francis Dupont <fdupont@isc.org>
Date: Tue, 28 Jun 2016 08:52:24 +0000 (+0200)
Subject: [master] Finished merge of trac4109a (DHCP4o6 v6 part
X-Git-Tag: trac4273_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d1f330d9b0a44039a8b9e0b479f8da1743b9504;p=thirdparty%2Fkea.git

[master] Finished merge of trac4109a (DHCP4o6 v6 part
---

diff --git a/ChangeLog b/ChangeLog
index 5c19f4c998..687d4fc503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,16 @@
+1134.	[func]		fdupont
+	Integrated the DHCPv6 service part of DHCPv4-ouver-DHCPv6 support.
+	(Trac #4109, git xxx)
+
 1133.	[func]		razvan
 	The initial support for CQL (Cassandra) backend added. It is able
 	to store leases information.
 	(Github #21, git d3a412d4b090bfd84ec5bc5d7817b1dfcc92602e)
 
 1132.	[func]		tmark
-	The Postgresql schema has been updated to support host reservations and its
-	version number has been bumped to 3.0.  This schema is content equivlent to
-	the MySQL schema version 4.2.
+	The Postgresql schema has been updated to support host
+	reservations and its version number has been bumped to 3.0.
+	This schema is content equivlent to the MySQL schema version 4.2.
 	(Trac #4275, git 6f8e646bee9de22c921ed26409f3d1856ebce9e6)
 
 1131.	[func]		fdupont