From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 26 Apr 2017 15:07:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.kea.isc.org/git/kea
X-Git-Tag: trac5212_base~2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2a89ec50e403697d1ff2d551cf55549efaeae2fc;p=thirdparty%2Fkea.git

Merge branch 'master' of ssh://git.kea.isc.org/git/kea

# Conflicts:
#	ChangeLog
---

2a89ec50e403697d1ff2d551cf55549efaeae2fc
diff --cc ChangeLog
index 61a7d22b10,4b116b1ec8..dbee300e6c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
- 1255.	[bug]		tomek
++1256.	[bug]		tomek
 +	Control Agent now writes proper configuration when using
 +	config-write command.
 +	(Trac #5253, git a1b5da4db6ebfa9635bbe411ec363cdcc4fd1d28)
 +
+ 1255.	[bug]		marcin
+ 	Fixed failing unit tests in libkea-http.
+ 	(Trac #5260, git 43394f76efb1634155c04b205dec7361fc21f4f9)
+ 
  1254.	[func]		tomek
  	Various improvements needed for upcoming host commands library:
  	host data source is now able to delete hosts, hosts can be exported