From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 10 Feb 2014 19:03:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
X-Git-Tag: bind10-1.2.0beta1-release~57^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecfe0ec289e3a9f790e3ff36e99c3079f161b41f;p=thirdparty%2Fkea.git

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

Conflicts:
	ChangeLog
---

ecfe0ec289e3a9f790e3ff36e99c3079f161b41f
diff --cc ChangeLog
index be84ebb2e2,b1f56a7b48..ec6c8d69a5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,9 +1,16 @@@
- 749.	[func]		tomek
++750.	[func]		tomek
 +	b10-dhcp4, b10-dhcp6: Simple client classification has been
 +	implemented. Incoming packets can be assigned to zero or more
 +	client classes. It is possible to restrict subnet usage to a given
 +	client class. User's Guide and Developer's Guide has been updated.
 +	(Trac #3274, git 1791d19899b92a6ee411199f664bdfc690ec08b2)
 +
+ 749.	[bug]		tmark
+ 	b10-dhcp-ddns now sets the TTL value in RRs that add A, AAAA, or PTR DNS
+ 	entries to the lease length provided in instigating NameChangeRequest.
+ 	This corrected a bug in which the TTL was always set to 0.
+ 	(Trac# 3299, git dbacf27ece77f3d857da793341c6bd31ef1ea239)
+ 
  748.	[bug]		marcin
  	b10-dhcp4 server picks a subnet, to assign address for a directly
  	connected client, using IP address of the interface on which the