From b21784dc799a2ae5f3180d9f935714193f36ccdf Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Thu, 22 Dec 2016 23:28:50 +0100 Subject: [PATCH 1/2] [5046] Removed spurious spaces --- doc/guide/dhcp4-srv.xml | 2 +- doc/guide/dhcp6-srv.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 9771f3452f..dc7034e834 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -3674,7 +3674,7 @@ src/lib/dhcpsrv/cfg_host_operations.cc --> it supports the following statistics related commands: statistic-get - statistic-reset + statistic-reset statistic-remove statistic-get-all statistic-reset-all diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 3a509f68bb..67d285bdfc 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -4078,7 +4078,7 @@ If not specified, the default value is: it supports the following statistics related commands: statistic-get - statistic-reset + statistic-reset statistic-remove statistic-get-all statistic-reset-all From f3f1c5230fd57bc0319196f8292362efcad7203b Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 23 Dec 2016 00:55:48 +0100 Subject: [PATCH 2/2] [5046] Set set-config command and fixed "be be" typo --- src/bin/dhcp4/ctrl_dhcp4_srv.cc | 4 ++-- src/bin/dhcp6/ctrl_dhcp6_srv.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.cc b/src/bin/dhcp4/ctrl_dhcp4_srv.cc index 05879f7235..6f2cfc1391 100644 --- a/src/bin/dhcp4/ctrl_dhcp4_srv.cc +++ b/src/bin/dhcp4/ctrl_dhcp4_srv.cc @@ -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 diff --git a/src/bin/dhcp6/ctrl_dhcp6_srv.cc b/src/bin/dhcp6/ctrl_dhcp6_srv.cc index c9ff04d85a..5b03783e47 100644 --- a/src/bin/dhcp6/ctrl_dhcp6_srv.cc +++ b/src/bin/dhcp6/ctrl_dhcp6_srv.cc @@ -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