]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3688'
authorMarcin Siodelski <marcin@isc.org>
Fri, 13 Mar 2015 14:08:33 +0000 (15:08 +0100)
committerMarcin Siodelski <marcin@isc.org>
Fri, 13 Mar 2015 14:08:33 +0000 (15:08 +0100)
commitb5c50e2aff64da05b439da8d5fa4913fc8a704ca
treeac2eb6dd24db190e92ee6e9486a4981a3208988c
parentef19bd40aa424c5ccb0353b6633b85a25d55f4a5
parenta397cb9b68ab1ede13fafa59e7631fda628c5d26
[master] Merge branch 'trac3688'

Conflicts:
src/bin/dhcp4/dhcp4_srv.h
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/dhcp4_srv.h
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
src/bin/dhcp4/tests/dhcp4_test_utils.cc
src/bin/dhcp4/tests/fqdn_unittest.cc
src/lib/dhcpsrv/host.cc
src/lib/dhcpsrv/host.h