]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3499' (hooks skip flag => next step status)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 13 Oct 2015 17:18:20 +0000 (19:18 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 13 Oct 2015 17:18:20 +0000 (19:18 +0200)
1  2 
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

Simple merge