[master] Merge branch 'trac3588'

diff --cc src/bin/dhcp4/tests/kea_controller_unittest.cc
index 5bfb3b0994185aac9535ca721fc06faa05721ae9,38bb36b36de0278fb8d6ac0abf729cdd736f3915..f5b6eff04d50be630e70a8ff66922eb429d80f69
--- 1/src/bin/dhcp4/tests/kea_controller_unittest.cc
--- 2/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@@ -18,6 -18,7 +18,7 @@@
  #include <dhcp/dhcp4.h>
  #include <dhcp4/ctrl_dhcp4_srv.h>
  #include <dhcpsrv/cfgmgr.h>
 -#include <log/logger_unittest_support.h>
++#include <log/logger_support.h>
  
  #include <boost/scoped_ptr.hpp>
  #include <gtest/gtest.h>
@@@ -57,6 -58,7 +58,7 @@@ public
      }
  
      ~JSONFileBackendTest() {
 -        isc::log::resetUnitTestRootLogger();
++        isc::log::setDefaultLoggingOutput();
          static_cast<void>(unlink(TEST_FILE));
      };
  

diff --cc src/bin/dhcp6/tests/kea_controller_unittest.cc
index 3bdffabb7bf11e1193730dd62866e5b5bad4f664,7a36f935fe585adde65bf3f298a70fad9ef1b6c4..7be309ad0d4266e28755a3c97452c79afb088bbc
--- 1/src/bin/dhcp6/tests/kea_controller_unittest.cc
--- 2/src/bin/dhcp6/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp6/tests/kea_controller_unittest.cc
@@@ -18,6 -18,7 +18,7 @@@
  #include <dhcp/dhcp6.h>
  #include <dhcp6/ctrl_dhcp6_srv.h>
  #include <dhcpsrv/cfgmgr.h>
 -#include <log/logger_unittest_support.h>
++#include <log/logger_support.h>
  
  #include <boost/scoped_ptr.hpp>
  #include <gtest/gtest.h>
@@@ -52,6 -53,7 +53,7 @@@ public
      }
  
      ~JSONFileBackendTest() {
 -        isc::log::resetUnitTestRootLogger();
++        isc::log::setDefaultLoggingOutput();
          static_cast<void>(unlink(TEST_FILE));
      };
  

diff --cc src/lib/dhcpsrv/logging.h
Simple merge

diff --cc src/lib/dhcpsrv/srv_config.cc
Simple merge