From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 11 Aug 2014 21:00:55 +0000 (+0200)
Subject: [master] Merge branch 'trac3508' (version reporting)
X-Git-Tag: trac3482_base~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=054775de2945a8bc51d6e5b8b49e03cc6011c17c;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3508' (version reporting)

Conflicts:
	ChangeLog
---

054775de2945a8bc51d6e5b8b49e03cc6011c17c
diff --cc ChangeLog
index ff6d1ba066,b81a9a45e4..a0032c3d6e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,6 +1,15 @@@
 -8xx.	[func]		tomek
++818.	[func]		tomek
+ 	DHCPv4,DHCPv6 and DDNS components now report their versions.
 -	(Trac #3508, git tbd)
++	(Trac #3508, git 3f46c74ffa0ea1197e1fa62cb2f6580931be35f3)
++
 +817.	[bug]		marcin
 +	DHCPv4 and DHCPv6 servers will log an error during an attempt to
 +	open socket on the interface which is down or not configured.
 +	(Trac #3487, git fadc776914aa858ce637aab1513ab3d87631f612)
 +
 +816.	[doc]		tomek
 +	AUTHORS file rewritten.
 +	(Trac #3469, git 6ef55abaa1ef79e09ad332c0da28dee7bfed70fe)
  
  815.	[func]		tomek
  	Pool definitions in DHCPv4 and DHCPv6 are now lists of