]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3798' (per subnet stats in DHCPv4)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 16 Jun 2015 11:40:32 +0000 (13:40 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 16 Jun 2015 11:40:32 +0000 (13:40 +0200)
commitbab2030f56bbf390959f9f9238a8acc62d583c70
treebb42ea3ea29e3ed1f9ac3a32474d418c9668956d
parentff499a1964fa979662772c3f735e572ea0c67e64
parent70f37c3b4ff642fc48f0958f85940b9a13af0ab9
[master] Merge branch 'trac3798' (per subnet stats in DHCPv4)

Conflicts:
src/bin/dhcp4/tests/dhcp4_test_utils.cc
doc/guide/dhcp4-srv.xml
src/bin/dhcp4/Makefile.am
src/bin/dhcp4/dhcp4_srv.cc
src/bin/dhcp4/tests/dhcp4_test_utils.cc
src/bin/dhcp4/tests/release_unittest.cc
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/alloc_engine.cc
src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc