]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3982' (Decline v6)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 22 Sep 2015 19:19:22 +0000 (21:19 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 22 Sep 2015 19:19:22 +0000 (21:19 +0200)
commit11e2c4366d8624601172c01e95cff6a8b95833b3
tree411d302b8662f239bf739da6657c096b519022a4
parente47176e625c0c02608a9d6d03dea8e169845099b
parent2d99e3f9eba5702853b61b9a8d518a8a5952b1ee
[master] Merge branch 'trac3982' (Decline v6)

Conflicts:
src/bin/dhcp6/dhcp6_srv.cc
src/lib/dhcpsrv/lease.cc
src/lib/dhcpsrv/tests/lease_unittest.cc
src/bin/dhcp6/dhcp6_srv.cc
src/bin/dhcp6/tests/Makefile.am
src/lib/dhcpsrv/lease.cc
src/lib/dhcpsrv/tests/lease_unittest.cc