Config parsing: Ignore some BIND9-specific resolv.conf options

[adns.git] / changelog

diff --git a/changelog b/changelog
index 959ac1d83fb2d8d35f264e5c33fcfabbca7ef784..0bcc2fb5d2106e5193d59dbcc42e67fcc9aabe78 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,7 +1,11 @@
-adns (1.5~~) UPSTREAM; urgency=low
+adns (1.5.0~rc1~) UPSTREAM; urgency=low
+
+  * WIP
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 20 Oct 2014 02:29:45 +0100
+
+adns (1.5.0~rc0) UPSTREAM; urgency=low
 
-  Licence changed to GPLv3 (still LGPLv2 for adns.h).
-  
   New features:
   * Support for queries about IPv6 data in all applicable adns
     query types (including AAAA, PTR, and adns_r_addr queries).
@@ -26,11 +30,12 @@ adns (1.5~~) UPSTREAM; urgency=low
   * Honour ADNS_TEST_DEBUG env. var.  (Mark Wooding.)
 
   Other improvements:
+  * Licence changed to GPLv3 (still LGPLv2 for adns.h).
   * Source code cleanups.  (Some from Mark Wooding.)
   * Now in git.
   * Documentation and webpage updates.
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sun, 19 Oct 2014 23:52:20 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 20 Oct 2014 01:29:50 +0100
 
 adns (1.4); urgency=low