From: Marcin Siodelski <marcin@isc.org>
Date: Tue, 6 Mar 2018 18:19:19 +0000 (+0100)
Subject: [master] Merge branch 'trac5457'
X-Git-Tag: ha_checkpoints12~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af43f07b0e227ccabcdf07a046a64cebb11bdccf;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5457'

# Conflicts:
#	src/bin/dhcp4/tests/callout_library_1.cc
#	src/bin/dhcp4/tests/callout_library_2.cc
---

af43f07b0e227ccabcdf07a046a64cebb11bdccf
diff --cc src/bin/dhcp4/tests/callout_library_1.cc
index 866652c6f6,af66942ae9..f5278dd970
--- a/src/bin/dhcp4/tests/callout_library_1.cc
+++ b/src/bin/dhcp4/tests/callout_library_1.cc
@@@ -11,6 -11,4 +11,6 @@@
  /// tests.  See callout_common.cc for details.
  
  static const int LIBRARY_NUMBER = 1;
 +#include <config.h>
+ #include <dhcp4/tests/callout_library_common.h>
 +
- #include "callout_library_common.h"
diff --cc src/bin/dhcp4/tests/callout_library_2.cc
index ae417a2969,8135e2b1cd..df4fdcdc44
--- a/src/bin/dhcp4/tests/callout_library_2.cc
+++ b/src/bin/dhcp4/tests/callout_library_2.cc
@@@ -11,6 -11,4 +11,6 @@@
  /// tests.  See callout_common.cc for details.
  
  static const int LIBRARY_NUMBER = 2;
 +#include <config.h>
+ #include <dhcp4/tests/callout_library_common.h>
 +
- #include "callout_library_common.h"