2.6.1 version prep

diff --git a/README.md b/README.md
index 17d620587f3292222e10b85d03b9f77537a0382d..43167859a82b47818a286edaad77e501c59a9260 100644 (file)
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ to facilitate the testing of DNS software.
 
 ## ABOUT THIS RELEASE
 
-This is dnspython 2.6.0.
+This is dnspython 2.6.1.
 Please read
 [What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
 information about the changes in this release.

diff --git a/dns/version.py b/dns/version.py
index 4522d0d24d2de153d2c2c6ed19b5b10a7484182a..251f2583d346fd4b18b52bc11689fd9315dbf087 100644 (file)
--- a/dns/version.py
+++ b/dns/version.py
@@ -22,7 +22,7 @@ MAJOR = 2
 #: MINOR
 MINOR = 6
 #: MICRO
-MICRO = 0
+MICRO = 1
 #: RELEASELEVEL
 RELEASELEVEL = 0x0F
 #: SERIAL

diff --git a/doc/conf.py b/doc/conf.py
index d62f885331569f5d295119bfa261f0e210cf4480..d70f1546cbcdd832e6c22916caafbb9d194be020 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -63,7 +63,7 @@ author = "Dnspython Contributors"
 # The short X.Y version.
 version = "2.6"
 # The full version, including alpha/beta/rc tags.
-release = "2.6.0"
+release = "2.6.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/whatsnew.rst b/doc/whatsnew.rst
index 202d92444c7bec3228ac689ad235ce3accc3c75e..fccbdc29e129e02f94f7d69db0edbd576d356fc4 100644 (file)
--- a/doc/whatsnew.rst
+++ b/doc/whatsnew.rst
@@ -3,6 +3,12 @@
 What's New in dnspython
 =======================
 
+2.6.1
+-----
+
+* The Tudoor fix ate legitimate Truncated exceptions, preventing the resolver from
+  failing over to TCP and causing the query to timeout [#1053].
+
 2.6.0
 -----