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

diff --cc ChangeLog
index b7e279fad7b5a7861812841eb24b1d4d55d390a4,36725026b412a449071d05c152747487786b9e6e..508d48ef85d37ede07c7c24235e5ffd1a45a5406
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,7 +1,27 @@@
-       (Trac #4202    git 91bf527662060d4b1e294cd53e79b431edf0e910)
++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)
 +
 +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 72289f2126ebb13bc4bcd93465a37e80b3102b91,8f859737487b5b2822c90a5f225ac4b3410477e0..4af7b6938c3d89465b54c3f2318e8a4543c80852
--- 1/src/lib/eval/location.hh
--- 2/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 65e1ca25744de62598ea11b25a2a10148d2f3789,fe32a47ff2e16c5cbb24100e26cf39a21416972e..66b9d8599bbf51481e23654c9d0e51a8eb3a0b3f
--- 1/src/lib/eval/position.hh
--- 2/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 5dc157912f6350e122ca346c53b1f970cbb2acc2,c1120dccb957090fb77d338f5bcbf07ebf90549e..847d20dbec1ae51810e6b0f63b031a9cbfca9b28
--- 1/src/lib/eval/stack.hh
--- 2/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++