mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 05:55:28 +00:00
Code Issues Releases Wiki Activity

[5046] Pickup Francis' changes

Browse Source
This commit is contained in:
Thomas Markwalder
2017-01-03 08:25:33 -05:00
parent ebb863e372 f3f1c5230f
commit 9d26dddc38
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guide/dhcp4-srv.xml
View File

@@ -3674,7 +3674,7 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
it supports the following statistics related commands:
<itemizedlist>
<listitem>statistic-get</listitem>
<listitem> statistic-reset</listitem>
<listitem>statistic-reset</listitem>
<listitem>statistic-remove</listitem>
<listitem>statistic-get-all</listitem>
<listitem>statistic-reset-all</listitem>

2
doc/guide/dhcp6-srv.xml
View File

@@ -4078,7 +4078,7 @@ If not specified, the default value is:
it supports the following statistics related commands:
<itemizedlist>
<listitem>statistic-get</listitem>
<listitem> statistic-reset</listitem>
<listitem>statistic-reset</listitem>
<listitem>statistic-remove</listitem>
<listitem>statistic-get-all</listitem>
<listitem>statistic-reset-all</listitem>

4
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View File

@@ -63,7 +63,7 @@ ConstElementPtr
ControlledDhcpv4Srv::commandConfigReloadHandler(const string&,
ConstElementPtr args) {
// Use set-config as it handles logging and server config
return (commandSetConfigHandler("", args));
return (commandSetConfigHandler("set-config", args));
}
ConstElementPtr
@@ -100,7 +100,7 @@ ControlledDhcpv4Srv::commandSetConfigHandler(const string&,
// configuration attempts.
CfgMgr::instance().rollback();
// Logging is a sibling element and must be be parsed explicitly.
// Logging is a sibling element and must be parsed explicitly.
// The call to configureLogger parses the given Logging element if
// not null, into the staging config. Note this does not alter the
// current loggers, they remain in effect until we apply the

4
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View File

@@ -68,7 +68,7 @@ ControlledDhcpv6Srv::commandLibReloadHandler(const string&, ConstElementPtr) {
ConstElementPtr
ControlledDhcpv6Srv::commandConfigReloadHandler(const string&, ConstElementPtr args) {
// Use set-config as it handles logging and server config
return (commandSetConfigHandler("", args));
return (commandSetConfigHandler("set-config", args));
}
ConstElementPtr
@@ -105,7 +105,7 @@ ControlledDhcpv6Srv::commandSetConfigHandler(const string&,
// configuration attempts.
CfgMgr::instance().rollback();
// Logging is a sibling element and must be be parsed explicitly.
// Logging is a sibling element and must be parsed explicitly.
// The call to configureLogger parses the given Logging element if
// not null, into the staging config. Note this does not alter the
// current loggers, they remain in effect until we apply the