From: Mark Andrews <marka@isc.org>
Date: Fri, 26 Apr 2013 11:29:13 +0000 (+1000)
Subject: Merge remote-tracking branch 'refs/remotes/origin/v9_8' into v9_8
X-Git-Tag: v9.8.5rc2~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a339ddd601fb7c6ecc1db5c944358ab9725277cc;p=thirdparty%2Fbind9.git

Merge remote-tracking branch 'refs/remotes/origin/v9_8' into v9_8
n names in
                        rdata which is no compressable when writing master
                        files.  [RT #22863]
(cherry picked from commit 38b84a1fcfdbda4d1d0fdca409004ae83be2ace8)
---

a339ddd601fb7c6ecc1db5c944358ab9725277cc
diff --cc CHANGES
index 76823d173af,4b49732b1a5..52a74308c91
--- a/CHANGES
+++ b/CHANGES
@@@ -16,10 -16,8 +16,12 @@@
  3547.	[bug]		Some malformed unknown rdata records were not properly
  			detected and rejected. [RT #33129]
  
+ 3056.	[func]		Added support for URI resource record. [RT #23386]
+ 
 +2565.	[func]		Add support for HIP record.  Includes new functions
 +			dns_rdata_hip_first(), dns_rdata_hip_next()
 +			and dns_rdata_hip_current().  [RT #19384]
 +
  	--- 9.8.5rc1 released ---
  
  3546.	[func]		Add EUI48 and EUI64 types. [RT #33082]