mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[master] Merge branch 'trac5134_rebase'

Browse Source 
# Conflicts:
#	src/bin/agent/Makefile.am
#	src/bin/agent/ca_cfg_mgr.cc
#	src/bin/agent/tests/.gitignore
#	src/bin/agent/tests/Makefile.am
#	src/bin/agent/tests/ca_cfg_mgr_unittests.cc
#	src/lib/process/tests/d_cfg_mgr_unittests.cc
This commit is contained in:
Tomek Mrugalski
2017-03-02 11:11:22 +01:00
parent d8c12b9f16 5ed26cc0b3
commit 828304f2f4
43 changed files with 1510 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/dhcp4/json_config_parser.cc
View File

@@ -22,6 +22,7 @@
#include <dhcpsrv/parsers/host_reservations_list_parser.h>
#include <dhcpsrv/parsers/ifaces_config_parser.h>
#include <dhcpsrv/timer_mgr.h>
#include <hooks/hooks_parser.h>
#include <config/command_mgr.h>
#include <util/encode/hex.h>
#include <util/strutil.h>
@@ -433,7 +434,7 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set,
// Some of the parsers alter the state of the system in a way that can't
// easily be undone. (Or alter it in a way such that undoing the change has
// the same risk of failure as doing the change.)
HooksLibrariesParser hooks_parser;
hooks::HooksLibrariesParser hooks_parser;
// Answer will hold the result.
ConstElementPtr answer;