From: Dima Volodin <dvv@isc.org>
Date: Tue, 11 Oct 2011 10:23:09 +0000 (-0400)
Subject: Merge branch 'trac1140'
X-Git-Tag: perftcpdns_before_epoll~37^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8eb6232b0094778b4c195a870fa2c06cd1b7d0ab;p=thirdparty%2Fkea.git

Merge branch 'trac1140'

Conflicts:
	ChangeLog
---

8eb6232b0094778b4c195a870fa2c06cd1b7d0ab
diff --cc ChangeLog
index 307bfca907,9b46597c8e..2db865e9c1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,6 +1,27 @@@
 -294.	[func]		dvv
++297.	[func]		dvv
+ 	Implement the SPF rrtype according to RFC4408.
 -	(Trac #1140, git tbd)
++	(Trac #1140, git 146934075349f94ee27f23bf9ff01711b94e369e)
++
 +296.	[build]		jreed
 +	Do not install the unittest libraries. At this time, they
 +	are not useful without source tree (and they may or may
 +	not have googletest support). Also, convert several makefiles
 +	to build tests at "check" time and not build time.
 +	(Trac #1091, git 2adf4a90ad79754d52126e7988769580d20501c3)
 +
 +295.	[bug]		jinmei
 +	__init__.py for isc.dns was installed in the wrong directory,
 +	which would now make xfrin fail to start.  It was also bad
 +	in that it replaced any existing __init__.py in th public
 +	site-packages directory.  After applying this fix You may want to
 +	check if the wrong init file is in the wrong place, in which
 +	case it should be removed.
 +	(Trac #1285, git af3b17472694f58b3d6a56d0baf64601b0f6a6a1)
 +
 +294.	[func]		jelte, jinmei, vorner
 +	b10-xfrin now supports incoming IXFR.  See BIND 10 Guide for
 +	how to configure it and operational notes.
 +	(Trac #1212, multiple git merges)
  
  293.    [func]*		tomek
  	b10-dhcp6: Implemented DHCPv6 echo server. It joins DHCPv6