]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac5032' (mac-sources, control-socket, relay parsers)
authorTomek Mrugalski <tomasz@isc.org>
Thu, 5 Jan 2017 14:42:39 +0000 (15:42 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 5 Jan 2017 14:42:39 +0000 (15:42 +0100)
commitf1c9dee0936b48be28f890ffd428fbdeb87c12ea
treec6d2d1e8a7f2c956b7b560438fc9cb58c98e27e5
parent6bb31a56bf14b7a671b05f8144681ce789499c80
parent3305fecc23ea8c6f8ec97655fbeb7f88ee2cd8f6
[master] Merge branch 'trac5032' (mac-sources, control-socket, relay parsers)

# Conflicts:
# src/lib/testutils/io_utils.cc
# src/lib/testutils/io_utils.h
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml
src/bin/dhcp4/json_config_parser.cc
src/bin/dhcp6/json_config_parser.cc
src/lib/testutils/io_utils.cc
src/lib/testutils/io_utils.h