]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3984' (v4 declined lease recovery)
authorTomek Mrugalski <tomasz@isc.org>
Thu, 1 Oct 2015 12:23:35 +0000 (14:23 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 1 Oct 2015 12:23:35 +0000 (14:23 +0200)
commit32a8ec68e0e5ea93991915812158d7628d2b4709
tree0f5b50a2364feae2ee67430767e9419cddf1ed9d
parent76f0f61072cf07b95f82a60fca34e7826b373307
parentd6d0a5437591c3613440403d64e5cff94f83070a
[master] Merge branch 'trac3984' (v4 declined lease recovery)

Conflicts:
src/lib/dhcpsrv/alloc_engine.cc
src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
src/lib/dhcpsrv/alloc_engine.cc
src/lib/dhcpsrv/alloc_engine.h
src/lib/dhcpsrv/alloc_engine_messages.mes
src/lib/dhcpsrv/lease.cc
src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc