From: JINMEI Tatuya <jinmei@isc.org>
Date: Mon, 10 Oct 2011 21:38:10 +0000 (-0700)
Subject: [master] Merge master and 1209b
X-Git-Tag: perftcpdns_before_epoll~37^2~22^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de9778c0c9db5a2e6ca3cfa384ae5a7b84120281;p=thirdparty%2Fkea.git

[master] Merge master and 1209b
---

de9778c0c9db5a2e6ca3cfa384ae5a7b84120281
diff --cc ChangeLog
index 71782eec29,51936df906..19d155109e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,11 +1,11 @@@
 -297.	[build]		jreed
++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 TODO)
+ 
 -296.	[bug]		jinmei
 +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