From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 10 Jun 2015 11:36:06 +0000 (+0200)
Subject: [master] Merge branch 'trac3796' (statistics interface, part 1)
X-Git-Tag: trac3732a_base~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3da062d51d7d5201a9ff2ef2e559bcb7beed561;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3796' (statistics interface, part 1)

Conflicts:
	src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
	src/bin/dhcp6/tests/dhcp6_test_utils.cc
---

d3da062d51d7d5201a9ff2ef2e559bcb7beed561
diff --cc src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
index fce5de672e,43c6ccfcf6..ecf2c7db7b
--- a/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
+++ b/src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
@@@ -42,9 -42,7 +42,8 @@@
  #include <gtest/gtest.h>
  #include <hooks/server_hooks.h>
  #include <hooks/hooks_manager.h>
- #include <config/ccsession.h>
 -
++#include <cc/command_interpreter.h>
 +#include <stats/stats_mgr.h>
- 
  #include <boost/scoped_ptr.hpp>
  
  #include <iostream>
diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.cc
index 2e93c1053d,06ddd5ea96..8816aa53d0
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.cc
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.cc
@@@ -16,8 -16,7 +16,8 @@@
  #include <gtest/gtest.h>
  #include <dhcp6/tests/dhcp6_test_utils.h>
  #include <dhcp6/json_config_parser.h>
- #include <config/ccsession.h>
 +#include <util/pointer_util.h>
+ #include <cc/command_interpreter.h>
  #include <string.h>
  
  using namespace isc::data;