]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3880' (control channel for DHCPv4)
authorTomek Mrugalski <tomasz@isc.org>
Wed, 17 Jun 2015 11:49:10 +0000 (13:49 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Wed, 17 Jun 2015 11:49:10 +0000 (13:49 +0200)
commit688658395518f0b97d5384af81ceab5206691ad5
treebc28465df60e54d480809a011e8ff3a9912f890b
parent7e130f51c532acdd8cc2cfe81368d3b27119057a
parent7d1aa845694223a37b47906a2b965da664519e95
[master] Merge branch 'trac3880' (control channel for DHCPv4)

Conflicts:
doc/guide/dhcp4-srv.xml
src/bin/dhcp4/tests/Makefile.am
src/lib/stats/stats_mgr.h
src/lib/stats/tests/stats_mgr_unittest.cc
ChangeLog
doc/devel/mainpage.dox
doc/guide/dhcp4-srv.xml
src/bin/dhcp4/tests/Makefile.am
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
src/lib/dhcpsrv/srv_config.h
src/lib/stats/stats_mgr.cc
src/lib/stats/stats_mgr.h
src/lib/stats/tests/stats_mgr_unittest.cc