From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 24 Jan 2018 12:01:56 +0000 (+0100)
Subject: Merge branch 'config-h' of https://github.com/andreipavelQ/kea into github38
X-Git-Tag: trac5458_base~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7206aa79c57be7466c4ab3dd558663c6c4f858b7;p=thirdparty%2Fkea.git

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
---

7206aa79c57be7466c4ab3dd558663c6c4f858b7
diff --cc src/lib/dhcpsrv/cql_connection.cc
index 2598f404d9,f1aceda8b4..0e88de7824
--- a/src/lib/dhcpsrv/cql_connection.cc
+++ b/src/lib/dhcpsrv/cql_connection.cc
@@@ -18,10 -17,10 +18,12 @@@
  #include <config.h>
  
  #include <dhcpsrv/cql_connection.h>
 -#include <string>
 +#include <dhcpsrv/cql_exchange.h>
 +#include <dhcpsrv/db_exceptions.h>
 +#include <dhcpsrv/dhcpsrv_log.h>
  
 -using namespace std;
++#include <string>
+ 
  namespace isc {
  namespace dhcp {