From: Francis Dupont <fdupont@isc.org>
Date: Wed, 25 Nov 2015 13:22:06 +0000 (+0100)
Subject: [master] Finished merge trac4097a (Classify and append options)
X-Git-Tag: trac4204fd_base~2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=752ad11ff4ebe97ec27d098aff706d1999900346;p=thirdparty%2Fkea.git

[master] Finished merge trac4097a (Classify and append options)
---

752ad11ff4ebe97ec27d098aff706d1999900346
diff --cc ChangeLog
index b7e279fad7,36725026b4..508d48ef85
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,7 +1,27 @@@
++1055.	[func]		[fdupont]
++	Classify match expressions are evaluated on incoming packets and
++	requested options are appended when configured by the subnet, a
++	class or globally.
++	(git #409[78], git xxx)
++
 +1054.	[func]		[tmark]
 +	Replaced underscores, "_", with hyphens "-", in the parameter
 +	names used in the kea-ddns server's configuration as well as
 +	those in the DDNS messages (NCRs) sent to the server. For
 +	example, "ip_address" is now "ip-address", "change_type" is
 +	now "change-type".  This makes JSON element naming consistent
 +	throughout Kea.
- 	(Trac #4202    git 91bf527662060d4b1e294cd53e79b431edf0e910)
++	(Trac #4202, git 91bf527662060d4b1e294cd53e79b431edf0e910)
 +
 +1053.	[doc]		tomek
 +	Support for DHCPDECLINE (v4) and DECLINE (v6) messages is
 +	now described in the Kea User's Guide.
 +	(Trac #3990, git 6b0db91610420f3cce55d9f887d7c73660ece209)
 +
  1052.	[func]		marcin
  	libeval: expressions involving options can now use textual or
  	hexadecimal format of the options.
--	(Trac #4093 git 4cdf0fff1067b3dde6570dc6831e8b1343bc50fe)
++	(Trac #4093, git 4cdf0fff1067b3dde6570dc6831e8b1343bc50fe)
  
  1051.	[func]		[tmark]
  	kea-dhcp4 and kea-dhcp6 configuration parsing now supports
diff --cc src/lib/eval/location.hh
index 72289f2126,8f85973748..4af7b6938c
--- a/src/lib/eval/location.hh
+++ b/src/lib/eval/location.hh
@@@ -1,4 -1,3 +1,4 @@@
- // Generated 20151120
++// Generated 20151125
  // A Bison parser, made by GNU Bison 3.0.4.
  
  // Locations for Bison parsers in C++
diff --cc src/lib/eval/position.hh
index 65e1ca2574,fe32a47ff2..66b9d8599b
--- a/src/lib/eval/position.hh
+++ b/src/lib/eval/position.hh
@@@ -1,4 -1,3 +1,4 @@@
- // Generated 20151120
++// Generated 20151125
  // A Bison parser, made by GNU Bison 3.0.4.
  
  // Positions for Bison parsers in C++
diff --cc src/lib/eval/stack.hh
index 5dc157912f,c1120dccb9..847d20dbec
--- a/src/lib/eval/stack.hh
+++ b/src/lib/eval/stack.hh
@@@ -1,4 -1,3 +1,4 @@@
- // Generated 20151120
++// Generated 20151125
  // A Bison parser, made by GNU Bison 3.0.4.
  
  // Stack handling for Bison parsers in C++