From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 17 Oct 2011 09:33:04 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
X-Git-Tag: perftcpdns_before_epoll~86^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67ea6de047d4dbd63c25fe7f03f5d5cc2452ad7d;p=thirdparty%2Fkea.git

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

Conflicts:
	ChangeLog
---

67ea6de047d4dbd63c25fe7f03f5d5cc2452ad7d
diff --cc ChangeLog
index e05334190a,f1f8a9ca0e..15293dfc07
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,12 +1,23 @@@
- 299.    [func]*         tomek
++300.    [func]*         tomek
 +	libdhcp: DHCP packet library was implemented. Currently it handles
 +	packet reception, option parsing, option generation and output
 +	packet building. Generic and specialized classes for several
 +	DHCPv6 options (IA_NA, IAADDR, address-list) are available. A
 +	simple code was added that leverages libdhcp. It is a skeleton
 +	DHCPv6 server. It receives incoming SOLICIT and REQUEST messages
 +	and responds with proper ADVERTISE and REPLY. Note that since
 +	LeaseManager is not implemented, server assigns a the same
 +	hardcoded lease for every client.
 +
+ 299.	[build]		jreed
+ 	Do not install the libfake_session, libtestutils, or libbench
+ 	libraries. They are used by tests within the source tree.
+ 	Convert all test-related makefiles to build test code at
+ 	regular make time to better work with test-driven development.
+ 	This reverts some of #1901. (The tests are ran using "make
+ 	check".)
+ 	(Trac #1286, git cee641fd3d12341d6bfce5a6fbd913e3aebc1e8e)
+ 
  bind10-devel-20111014 released on October 14, 2011
  
  298.	[doc]		jreed