]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3988' (lease{4,6}_recover hooks)
authorTomek Mrugalski <tomasz@isc.org>
Mon, 30 Nov 2015 11:36:46 +0000 (12:36 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 30 Nov 2015 11:36:46 +0000 (12:36 +0100)
commite1cd854c40786e528a24d4cc16e9874b95029c52
tree54fb822098a20a8966a4f32db88d8c000475ea6f
parent99fd9d70360cf8d4ab5bb5f916546d862ea431c4
parent1195d772780b35b9295bf5d84a8db708ac8ad6c7
[master] Merge branch 'trac3988' (lease{4,6}_recover hooks)

# 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/dhcpsrv_messages.mes
src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc