]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac5651'
authorMarcin Siodelski <marcin@isc.org>
Mon, 9 Jul 2018 11:53:18 +0000 (13:53 +0200)
committerMarcin Siodelski <marcin@isc.org>
Mon, 9 Jul 2018 12:37:16 +0000 (14:37 +0200)
commitb056828212f7b206ff8bd07c097fd6f427d22d71
tree17887f3b6e7fa69e348e7ba21fe1de2cfd13d209
parentb9411839a1ab731fe3f65d000610ee3b3f01d115
parented42dddca962717bb684a492ee7a622b00c62bf8
[master] Merge branch 'trac5651'

# Conflicts:
# doc/guide/hooks.xml
# src/lib/dhcpsrv/cql_lease_mgr.cc
doc/guide/hooks-lease-cmds.xml
doc/guide/hooks.xml
src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
src/lib/dhcpsrv/cql_lease_mgr.cc
src/lib/dhcpsrv/memfile_lease_mgr.h
src/lib/dhcpsrv/mysql_lease_mgr.cc
src/lib/dhcpsrv/pgsql_lease_mgr.cc
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc