]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac5039' (SimpleParser)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 27 Dec 2016 18:25:31 +0000 (19:25 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 27 Dec 2016 18:25:31 +0000 (19:25 +0100)
commit3cd100455bcc20698cfb314ffe41fb755d04aee1
treef3f51046183e84d2a6a43dc40b7b5760f3b3839c
parent37e25034ecb23a4b28a169340069dd15a57b0ede
parent89151107ea46bca4ce6b45af3427c2293b86cdd1
[master] Merge branch 'trac5039' (SimpleParser)

# Conflicts:
# src/bin/dhcp4/Makefile.am
# src/bin/dhcp4/json_config_parser.cc
# src/bin/dhcp6/Makefile.am
# src/bin/dhcp6/dhcp6.dox
# src/bin/dhcp6/json_config_parser.cc
# src/bin/dhcp6/tests/Makefile.am
17 files changed:
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml
src/bin/dhcp4/Makefile.am
src/bin/dhcp4/dhcp4.dox
src/bin/dhcp4/json_config_parser.cc
src/bin/dhcp4/tests/Makefile.am
src/bin/dhcp4/tests/config_parser_unittest.cc
src/bin/dhcp6/Makefile.am
src/bin/dhcp6/dhcp6.dox
src/bin/dhcp6/tests/Makefile.am
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
src/lib/cc/data.cc
src/lib/cc/tests/Makefile.am
src/lib/cc/tests/data_unittests.cc
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc