]> git.ipfire.org Git - thirdparty/kea.git/commit
[3569_rebase] Merge branch 'trac3569' into trac3569_rebase trac3569_rebase
authorTomek Mrugalski <tomasz@isc.org>
Mon, 30 Nov 2015 21:10:58 +0000 (22:10 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 30 Nov 2015 21:10:58 +0000 (22:10 +0100)
commit108acb67e96bc862c73a4529db53e6f6303bc071
treeedaccea4f8056b6e2d563ab4ccae950e332927f1
parent3a4b1c7a23cab86b280ae0dfbca6b8fe03e6eb08
parent79b2338c037bf9cedca89aaba51d54698486cd6c
[3569_rebase] Merge branch 'trac3569' into trac3569_rebase

# Conflicts:
# src/lib/dhcpsrv/host_mgr.h
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
src/bin/dhcp6/json_config_parser.cc
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
src/lib/dhcpsrv/base_host_data_source.h
src/lib/dhcpsrv/host_mgr.h