From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 30 Sep 2014 17:23:31 +0000 (+0200)
Subject: [master] Merge branch 'trac3588'
X-Git-Tag: rt3470_base
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efcbf02951375e6e080665899d187be8b162cdb8;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3588'
---

efcbf02951375e6e080665899d187be8b162cdb8
diff --cc src/bin/dhcp4/tests/kea_controller_unittest.cc
index 5bfb3b0994,38bb36b36d..f5b6eff04d
--- a/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 3bdffabb7b,7a36f935fe..7be309ad0d
--- a/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));
      };