Commit 7206aa79 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

Merge branch 'config-h' of https://github.com/andreipavelQ/kea into github38

# Conflicts:
#	src/lib/config/config_data.cc
#	src/lib/config/module_spec.cc
#	src/lib/config/tests/config_data_unittests.cc
#	src/lib/config/tests/module_spec_unittests.cc
#	src/lib/dhcpsrv/cql_connection.cc
#	src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
parents d59f7e36 f14a42d0
......@@ -6,6 +6,8 @@
/// Defines the logger used by the top-level component of kea-dhcp-ddns.
#include <config.h>
#include <d2/d2_log.h>
namespace isc {
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <d2/d2_update_message.h>
#include <dns/messagerenderer.h>
#include <dns/name.h>
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <d2/d2_zone.h>
namespace isc {
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <log/logger_support.h>
#include <d2/d2_log.h>
#include <gtest/gtest.h>
......
......@@ -7,6 +7,8 @@
/// @file dhcp4_log.cc
/// Contains the loggers used by the DHCPv4 server component.
#include <config.h>
#include <dhcp4/dhcp4_log.h>
namespace isc {
......
......@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 1;
#include <config.h>
#include "callout_library_common.h"
......@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 2;
#include <config.h>
#include "callout_library_common.h"
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <log/logger_support.h>
#include <dhcp4/dhcp4_log.h>
#include <gtest/gtest.h>
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include "marker_file.h"
#include <gtest/gtest.h>
......
......@@ -7,6 +7,8 @@
/// @file dhcp6_log.cc
/// Contains the loggers used by the DHCPv6 server component.
#include <config.h>
#include <dhcp6/dhcp6_log.h>
namespace isc {
......
......@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 1;
#include <config.h>
#include "callout_library_common.h"
......@@ -11,4 +11,6 @@
/// tests. See callout_common.cc for details.
static const int LIBRARY_NUMBER = 2;
#include <config.h>
#include "callout_library_common.h"
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <log/logger_support.h>
#include <gtest/gtest.h>
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include "marker_file.h"
#include <gtest/gtest.h>
......
......@@ -6,6 +6,8 @@
/// Defines the logger used by the top-level component of kea-lfc.
#include <config.h>
#include <lfc/lfc_log.h>
namespace isc {
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <lfc/lfc_controller.h>
#include <util/csv_file.h>
#include <gtest/gtest.h>
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <log/logger_support.h>
#include <gtest/gtest.h>
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <exceptions/exceptions.h>
#include "rate_control.h"
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include <exceptions/exceptions.h>
#include "rate_control.h"
#include <gtest/gtest.h>
......
......@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <config.h>
#include "sockcreator.h"
#include <unistd.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