[#899] fixed rebase

diff --git a/src/hooks/dhcp/run_script/libloadtests/test_script.sh b/src/hooks/dhcp/run_script/libloadtests/test_script.sh
deleted file mode 100755 (executable)
index 039e4d0..0000000
--- a/src/hooks/dhcp/run_script/libloadtests/test_script.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exit 0

diff --git a/src/hooks/dhcp/run_script/run_script.cc b/src/hooks/dhcp/run_script/run_script.cc
index b66e2f5744004ca1fb7eef5147552f9cce1993dc..59287dc58d82b7d6812c05910f1e1ba48d0b4ae6 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script.cc
+++ b/src/hooks/dhcp/run_script/run_script.cc
@@ -414,103 +414,5 @@ RunScriptImpl::extractPkt6(isc::util::ProcessEnvVars& vars,
     }
 }
 
-void
-RunScriptImpl::extractBoolean(isc::util::ProcessEnvVars& vars,
-                              const bool value,
-                              const std::string prefix,
-                              const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractInteger(isc::util::ProcessEnvVars& vars,
-                              const uint32_t value,
-                              const std::string prefix,
-                              const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractString(isc::util::ProcessEnvVars& vars,
-                             const bool value,
-                             const std::string prefix,
-                             const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractHWAddr(isc::util::ProcessEnvVars& vars,
-                             const isc::dhcp::HWAddrPtr& hwaddr,
-                             const std::string prefix,
-                             const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractClientID(isc::util::ProcessEnvVars& vars,
-                               const isc::dhcp::ClientIdPtr clientid,
-                               const std::string prefix,
-                               const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractOptionIA(isc::util::ProcessEnvVars& vars,
-                               const isc::dhcp::Option6IAPtr option6IA,
-                               const std::string prefix,
-                               const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractSubnet4(isc::util::ProcessEnvVars& vars,
-                              const isc::dhcp::Subnet4Ptr subnet4,
-                              const std::string prefix,
-                              const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractSubnet6(isc::util::ProcessEnvVars& vars,
-                              const isc::dhcp::Subnet6Ptr subnet6,
-                              const std::string prefix,
-                              const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractLease4(isc::util::ProcessEnvVars& vars,
-                             const isc::dhcp::Lease4Ptr& lease4,
-                             const std::string prefix,
-                             const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractLease6(isc::util::ProcessEnvVars& vars,
-                             const isc::dhcp::Lease6Ptr& lease6,
-                             const std::string prefix,
-                             const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractLeases4(isc::util::ProcessEnvVars& vars,
-                              const isc::dhcp::Lease4CollectionPtr& leases4,
-                              const std::string prefix,
-                              const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractLeases6(isc::util::ProcessEnvVars& vars,
-                              const isc::dhcp::Lease6CollectionPtr& leases6,
-                              const std::string prefix,
-                              const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractPkt4(isc::util::ProcessEnvVars& vars,
-                           const isc::dhcp::Pkt4Ptr& pkt4,
-                           const std::string prefix,
-                           const std::string sufix) {
-}
-
-void
-RunScriptImpl::extractPkt6(isc::util::ProcessEnvVars& vars,
-                           const isc::dhcp::Pkt6Ptr& pkt6,
-                           const std::string prefix,
-                           const std::string sufix) {
-}
-
 } // end of namespace run_script
 } // end of namespace isc