From: Jeremy C. Reed <jreed@isc.org>
Date: Fri, 3 May 2013 01:01:24 +0000 (-0500)
Subject: [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
X-Git-Tag: bind10-1.1.0beta2-release~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f92c87372c0a3b37fabb3ee1963dca5409ccde5;p=thirdparty%2Fkea.git

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

fix conflict
---

9f92c87372c0a3b37fabb3ee1963dca5409ccde5
diff --cc ChangeLog
index f8d91a59ce,0889ff7c67..5552772fbd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,9 +1,11 @@@
 +bind10-1.0.0beta2 released on May 3, 2013
 +
+ 610.	[bug]		muks
+ 	When the sqlite3 program is not available on the system (in
+ 	PATH), we no longer attempt to run some tests which depend
+ 	on it.
+ 	(Trac #1909, git f85b274b85b57a094d33ca06dfbe12ae67bb47df)
+ 
  609.	[bug]		jinmei
  	Handled some rare error cases in DNS server classes correctly.
  	This fix specifically solves occasional crash of b10-auth due to