mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 07:25:18 +00:00
Code Issues Releases Wiki Activity

[2270] Merge branch 'master' into trac2270

Browse Source 
Conflicts:
	ChangeLog
	doc/devel/02-dhcp.dox
	src/bin/dhcp4/ctrl_dhcp4_srv.cc
	src/bin/dhcp4/dhcp4_srv.cc
	src/bin/dhcp4/dhcp4_srv.h
	src/bin/dhcp6/config_parser.cc
	src/bin/dhcp6/config_parser.h
This commit is contained in:
Tomek Mrugalski
2012-12-12 14:50:38 +01:00
parent de29c07129 92758ecffc
commit c328aed83b
672 changed files with 39635 additions and 8147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/config_parser.cc
View File

@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config/ccsession.h>
#include <dhcp/cfgmgr.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcp4/config_parser.h>
#include <dhcp4/dhcp4_log.h>
#include <boost/foreach.hpp>