]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3563' (Reservations in DHCPv6)
authorTomek Mrugalski <tomasz@isc.org>
Thu, 5 Feb 2015 15:12:03 +0000 (16:12 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 5 Feb 2015 15:12:03 +0000 (16:12 +0100)
commite2a3e5e74adb4bdb10958a34dcffcb7b6f300f62
tree95e2ff37007de9f8a6c4cfeffe42535ebe3e2c93
parent519e56733f24fbec4c539dafc59d33c03e313404
parentd5c43ea6f00802aca65a6622b95d1f280b3a1bff
[master] Merge branch 'trac3563' (Reservations in DHCPv6)

Conflicts:
src/lib/dhcpsrv/alloc_engine.cc
src/bin/dhcp6/dhcp6_srv.cc
src/lib/dhcpsrv/alloc_engine.cc
src/lib/dhcpsrv/subnet.h
src/lib/dhcpsrv/tests/alloc_engine_unittest.cc