prep 1.11

diff --git a/ChangeLog b/ChangeLog
index 2db5b022ff4ba187bcd1dadb6ca3c1768b748a6c..6a076d1c4e1d709e4e5935dc06d7b6571fa0abee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-01  Bob Halley  <halley@dnspython.org>
+
+       * (Version 1.11.0 released)
+
 2013-04-28  Bob Halley  <halley@dnspython.org>
 
        * dns/name.py (Name.to_wire): Do not add items with offsets >= 2^14
@@ -11,6 +15,19 @@
          field.  Thanks to David Waitzman for reporting the bug and
          suggesting the fix.
 
+2013-03-31  Bob Halley  <halley@dnspython.org>
+
+       * lock caches in case they are shared
+
+       * raise YXDOMAIN if we see one
+
+       * do not print empty rdatasets
+
+       * Add contributed $GENERATE support (thanks uberj)
+
+       * Remove DNSKEY keytag uniqueness assumption (RFC 4034, section 8)
+         (thanks James Dempsey)
+
 2012-09-25  Sean Leach
 
        * added set_flags() method to dns.resolver.Resolver

diff --git a/README b/README
index e3777df4c8acc94ac6fa34aa28510110618a1513..c51c9d93f0ec8bca3f3560b312c4aca3102115dc 100644 (file)
--- a/README
+++ b/README
@@ -22,7 +22,15 @@ development by continuing to employ the author :).
 
 ABOUT THIS RELEASE
 
-This is dnspython 1.10.0
+This is dnspython 1.11.0
+
+New since 1.10.0:
+    
+        XXX TBS XXX
+
+Bugs fixed since 1.10.0:
+
+        XXX TBS XXX
 
 New since 1.9.4:
 

diff --git a/dns/version.py b/dns/version.py
index 7de430b638aeaf8ba72f4c3e2a6f823dbd8c7b91..7f393bec4d9266741003af08de4c8336c3020d32 100644 (file)
--- a/dns/version.py
+++ b/dns/version.py
@@ -16,7 +16,7 @@
 """dnspython release version information."""
 
 MAJOR = 1
-MINOR = 10
+MINOR = 11
 MICRO = 0
 RELEASELEVEL = 0x0f
 SERIAL = 0

diff --git a/setup.py b/setup.py
index 33d7c2067973f73e08e9075a28046d40d3cf61c6..a6e45a28daf5199cf986383a73876b34777230b8 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 import sys
 from distutils.core import setup
 
-version = '1.10.0'
+version = '1.11.0'
 
 kwargs = {
     'name' : 'dnspython',