From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 10 Dec 2014 08:42:44 +0000 (+0100)
Subject: [master] Merge branch 'trac3551' (RFC6939 support)
X-Git-Tag: kea-eng-20141219~10
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=23fca8ea6e7895448c3a90079b3eca15bb810553;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3551' (RFC6939 support)

Conflicts:
	ChangeLog
---

23fca8ea6e7895448c3a90079b3eca15bb810553
diff --cc ChangeLog
index 8810d9e1ad,6d0c9528d0..8f8cd7b1d4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,12 @@@
 -6XX.	[func]		dgutier
++862.	[func]		dgutier, tomek
+ 	Support for client link-layer address option (RFC6939) has
+ 	been added.
 -	(Trac #3551, git abcd)
++	(Trac #3551, git dabdf965d92085f86d5e96c8dadce0f0a8f7c8e3)
++
 +861.	[func]		marcin
 +	The configuration parameters for a DHCPv4 and DHCPv6 options are now
 +	optional.
 +	(Trac #3467, git 7bf8cef161e6dd00a7f2b2fe8ec04e1958d6db3f)
  
  860.	[bug]		marcin
  	Fixed calculation of the Client FQDN option length for the ASCII