Commit 9d26dddc authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[5046] Pickup Francis' changes

parents ebb863e3 f3f1c523
...@@ -3674,7 +3674,7 @@ src/lib/dhcpsrv/cfg_host_operations.cc --> ...@@ -3674,7 +3674,7 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
it supports the following statistics related commands: it supports the following statistics related commands:
<itemizedlist> <itemizedlist>
<listitem>statistic-get</listitem> <listitem>statistic-get</listitem>
<listitem> statistic-reset</listitem> <listitem>statistic-reset</listitem>
<listitem>statistic-remove</listitem> <listitem>statistic-remove</listitem>
<listitem>statistic-get-all</listitem> <listitem>statistic-get-all</listitem>
<listitem>statistic-reset-all</listitem> <listitem>statistic-reset-all</listitem>
......
...@@ -4078,7 +4078,7 @@ If not specified, the default value is: ...@@ -4078,7 +4078,7 @@ If not specified, the default value is:
it supports the following statistics related commands: it supports the following statistics related commands:
<itemizedlist> <itemizedlist>
<listitem>statistic-get</listitem> <listitem>statistic-get</listitem>
<listitem> statistic-reset</listitem> <listitem>statistic-reset</listitem>
<listitem>statistic-remove</listitem> <listitem>statistic-remove</listitem>
<listitem>statistic-get-all</listitem> <listitem>statistic-get-all</listitem>
<listitem>statistic-reset-all</listitem> <listitem>statistic-reset-all</listitem>
......
...@@ -63,7 +63,7 @@ ConstElementPtr ...@@ -63,7 +63,7 @@ ConstElementPtr
ControlledDhcpv4Srv::commandConfigReloadHandler(const string&, ControlledDhcpv4Srv::commandConfigReloadHandler(const string&,
ConstElementPtr args) { ConstElementPtr args) {
// Use set-config as it handles logging and server config // Use set-config as it handles logging and server config
return (commandSetConfigHandler("", args)); return (commandSetConfigHandler("set-config", args));
} }
ConstElementPtr ConstElementPtr
...@@ -100,7 +100,7 @@ ControlledDhcpv4Srv::commandSetConfigHandler(const string&, ...@@ -100,7 +100,7 @@ ControlledDhcpv4Srv::commandSetConfigHandler(const string&,
// configuration attempts. // configuration attempts.
CfgMgr::instance().rollback(); 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 // The call to configureLogger parses the given Logging element if
// not null, into the staging config. Note this does not alter the // not null, into the staging config. Note this does not alter the
// current loggers, they remain in effect until we apply the // current loggers, they remain in effect until we apply the
......
...@@ -68,7 +68,7 @@ ControlledDhcpv6Srv::commandLibReloadHandler(const string&, ConstElementPtr) { ...@@ -68,7 +68,7 @@ ControlledDhcpv6Srv::commandLibReloadHandler(const string&, ConstElementPtr) {
ConstElementPtr ConstElementPtr
ControlledDhcpv6Srv::commandConfigReloadHandler(const string&, ConstElementPtr args) { ControlledDhcpv6Srv::commandConfigReloadHandler(const string&, ConstElementPtr args) {
// Use set-config as it handles logging and server config // Use set-config as it handles logging and server config
return (commandSetConfigHandler("", args)); return (commandSetConfigHandler("set-config", args));
} }
ConstElementPtr ConstElementPtr
...@@ -105,7 +105,7 @@ ControlledDhcpv6Srv::commandSetConfigHandler(const string&, ...@@ -105,7 +105,7 @@ ControlledDhcpv6Srv::commandSetConfigHandler(const string&,
// configuration attempts. // configuration attempts.
CfgMgr::instance().rollback(); 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 // The call to configureLogger parses the given Logging element if
// not null, into the staging config. Note this does not alter the // not null, into the staging config. Note this does not alter the
// current loggers, they remain in effect until we apply the // current loggers, they remain in effect until we apply the
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment