From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 27 Aug 2014 16:25:54 +0000 (+0200)
Subject: [master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea
X-Git-Tag: trac3482_base~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d330a5830d76e553ede0753f0ce259765ab5baa7;p=thirdparty%2Fkea.git

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

Conflicts:
	ChangeLog
---

d330a5830d76e553ede0753f0ce259765ab5baa7
diff --cc ChangeLog
index f02556effd,279d770597..3136982250
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,11 +1,16 @@@
- 832.	[bug]		jiri
++833.	[bug]		jiri
 +	Compilation fix for PostgreSQL on i686. Thanks to Jiri Popelka
 +	from RedHat for providing a patch!
 +	(Trac #3532, git 96a06654f2177444dcea3a0e9f6fa06947855497)
 +
+ 832.	[func]		marcin
+ 	DHCP servers check if the interfaces specified in the configuration,
+ 	to be used to receive DHCP messsages, are present in the system.
+ 	If the interface doesn't exist, an error is reported. In addition,
+ 	the SO_REUSEPORT flag is set for IPv6 sockets as multiple multicast
+ 	sockets can be bound to the DHCPv6 server port.
+ 	(Trac #3512, git 5cbbab2d01c6e1bf6d563ba64d80bc6bc857f73d)
+ 
  831.	[bug]		marcin
  	Kea deamons report configuration summary when the configuration is
  	completed successfully.