From: Francis Dupont <fdupont@isc.org>
Date: Sun, 31 Dec 2017 10:07:28 +0000 (+0100)
Subject: [master] Finishing merge of trac5351 (user context / comment)
X-Git-Tag: trac5494_base~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f154a976b572b7b68d693e216e10e2cf9702ef4d;p=thirdparty%2Fkea.git

[master] Finishing merge of trac5351 (user context / comment)
---

f154a976b572b7b68d693e216e10e2cf9702ef4d
diff --cc ChangeLog
index 3376ec3262,bbec06a9f0..80c53a6c47
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,3 +1,20 @@@
++1343.	[func]		fdupont
++	User-context and comments are now supported in many new scopes:
++	global, shared-network, subnet, pool, host reservation, option,
++	option definition, client-class, control-socket, dhcp-ddns,
++	interfaces, loggers, and for DHCPv6 pd-pool and server-id.
++	(Trac #5351, git xxx)
++
++1342.	[bug]		fdupont
++	Fixed subnets and host reservations returned by config-get and
++	config-write.
++	(Trac #5452, git xxx)
++
 +1341.	[func]		razvan, andrei
 +	Significant update of Cassandra support. A lot of code for
 +	Cassandr Lease Manager has been updated and partially rewritten.
 +	(github #35, git 41795494720cd9886c1e98d21eaeefd94d674e37)
 +
  1340.	[func]		marcin
  	Added support for "dhcp-enable" and "dhcp-disable" commands in
  	the DHCPv4 and DHCPv6 server.
diff --cc src/bin/dhcp4/tests/config_parser_unittest.cc
index 8671c2cdd0,194cef0d75..0653b5c7e1
--- a/src/bin/dhcp4/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp4/tests/config_parser_unittest.cc
@@@ -10,7 -10,9 +10,8 @@@
  #include <gtest/gtest.h>
  
  #include <cc/command_interpreter.h>
 -#include <config/module_spec.h>
  #include <dhcp4/dhcp4_srv.h>
+ #include <dhcp4/ctrl_dhcp4_srv.h>
  #include <dhcp4/json_config_parser.h>
  #include <dhcp/option4_addrlst.h>
  #include <dhcp/option_custom.h>