Commit d3da062d authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[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
parents 9f7213c5 21e87bbc
......@@ -18,7 +18,7 @@
#include <asiolink/io_service.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d2/d2_log.h>
#include <d2/d_controller.h>
#include <d2/d_process.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d2/d2_log.h>
#include <d2/d2_cfg_mgr.h>
#include <d2/d2_process.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d2/d2_log.h>
#include <dhcp/libdhcp++.h>
#include <d2/d_cfg_mgr.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <d2/d2_log.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d2/d_controller.h>
#include <exceptions/exceptions.h>
#include <log/logger_support.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/bundy_d2_controller.h>
#include <d2/spec_config.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/d2_controller.h>
#include <d2/d2_process.h>
......
......@@ -15,7 +15,7 @@
#include <config.h>
#include <asiolink/io_service.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d2/d2_process.h>
#include <dhcp_ddns/ncr_io.h>
#include <d_test_stubs.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <config/module_spec.h>
#include <dhcpsrv/parsers/dhcp_parsers.h>
#include <d2/d_cfg_mgr.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d_test_stubs.h>
#include <d2/spec_config.h>
......
......@@ -18,8 +18,7 @@
#include <asiolink/io_service.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <d2/d_controller.h>
#include <d2/d_cfg_mgr.h>
......
......@@ -17,7 +17,7 @@
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp/iface_mgr.h>
#include <dhcp4/json_config_parser.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
......
......@@ -17,8 +17,7 @@
#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp4/dhcp4_srv.h>
namespace isc {
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp4/dhcp4_log.h>
#include <dhcp/libdhcp++.h>
#include <dhcp/option_definition.h>
......
......@@ -17,7 +17,8 @@
#include <arpa/inet.h>
#include <gtest/gtest.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <config/module_spec.h>
#include <dhcp4/dhcp4_srv.h>
#include <dhcp4/json_config_parser.h>
#include <dhcp/option4_addrlst.h>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <hooks/hooks_manager.h>
......
......@@ -18,7 +18,7 @@
#define D2_UNITTEST_H
#include <dhcp4/dhcp4_srv.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <gtest/gtest.h>
......
......@@ -16,7 +16,7 @@
#include <sstream>
#include <asiolink/io_address.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp4/tests/dhcp4_test_utils.h>
#include <dhcp/tests/pkt_captures.h>
#include <dhcp/dhcp4.h>
......@@ -42,9 +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>
......
......@@ -16,7 +16,7 @@
#include <asiolink/io_address.h>
#include <cc/data.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp4/json_config_parser.h>
#include <dhcp4/tests/dhcp4_test_utils.h>
#include <dhcp/option4_addrlst.h>
......
......@@ -30,7 +30,7 @@
#include <dhcpsrv/lease_mgr_factory.h>
#include <dhcp4/dhcp4_srv.h>
#include <asiolink/io_address.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <list>
#include <boost/shared_ptr.hpp>
......
......@@ -14,7 +14,7 @@
#include <config.h>
#include <config/ccsession.h>
#include <cc/command_interpreter.h>
#include <dhcp/dhcp4.h>
#include <dhcp4/ctrl_dhcp4_srv.h>
#include <dhcpsrv/cfgmgr.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment