From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 18 Sep 2015 16:10:28 +0000 (+0200)
Subject: [master] Merge branch 'trac3981'
X-Git-Tag: trac4061_base~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c14a63c0d3a56ea3e880e874f854adc0077de75e;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3981'

Conflicts:
	src/bin/dhcp4/tests/Makefile.am
---

c14a63c0d3a56ea3e880e874f854adc0077de75e
diff --cc src/bin/dhcp4/tests/Makefile.am
index 5648da73fd,83966fe06b..721cad3a78
--- a/src/bin/dhcp4/tests/Makefile.am
+++ b/src/bin/dhcp4/tests/Makefile.am
@@@ -88,8 -86,8 +88,8 @@@ dhcp4_unittests_SOURCES += dhcp4_client
  dhcp4_unittests_SOURCES += inform_unittest.cc
  dhcp4_unittests_SOURCES += dora_unittest.cc
  dhcp4_unittests_SOURCES += release_unittest.cc
 +dhcp4_unittests_SOURCES += out_of_range_unittest.cc
- 
+ dhcp4_unittests_SOURCES += decline_unittest.cc
 -
  dhcp4_unittests_SOURCES += kea_controller_unittest.cc
  
  nodist_dhcp4_unittests_SOURCES = marker_file.h test_libraries.h