summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-04-12 09:27:47 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-04-12 09:27:47 -0400
commit2090f4eb88c835b021a018196ab4a1664aca1ed4 (patch)
tree0c71431f47e04e41b57871f1eec9836d521116e9
parent4925e352ecce6e81939da800ac244ff895caf0ff (diff)
downloadcherrypy-2090f4eb88c835b021a018196ab4a1664aca1ed4.tar.gz
Bumped to 3.2.6 in preparation for next release.3.2.6
-rw-r--r--cherrypy/__init__.py2
-rw-r--r--cherrypy/wsgiserver/wsgiserver2.py2
-rw-r--r--cherrypy/wsgiserver/wsgiserver3.py2
-rw-r--r--release.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py
index 29621193..78b7b883 100644
--- a/cherrypy/__init__.py
+++ b/cherrypy/__init__.py
@@ -57,7 +57,7 @@ These API's are described in the CherryPy specification:
http://www.cherrypy.org/wiki/CherryPySpec
"""
-__version__ = "3.2.5"
+__version__ = "3.2.6"
from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode
from cherrypy._cpcompat import basestring, unicodestr, set
diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py
index 4192c2dc..382d39a7 100644
--- a/cherrypy/wsgiserver/wsgiserver2.py
+++ b/cherrypy/wsgiserver/wsgiserver2.py
@@ -1659,7 +1659,7 @@ class HTTPServer(object):
timeout = 10
"""The timeout in seconds for accepted connections (default 10)."""
- version = "CherryPy/3.2.5"
+ version = "CherryPy/3.2.6"
"""A version string for the HTTPServer."""
software = None
diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py
index 0467c10d..58635f43 100644
--- a/cherrypy/wsgiserver/wsgiserver3.py
+++ b/cherrypy/wsgiserver/wsgiserver3.py
@@ -1384,7 +1384,7 @@ class HTTPServer(object):
timeout = 10
"""The timeout in seconds for accepted connections (default 10)."""
- version = "CherryPy/3.2.5"
+ version = "CherryPy/3.2.6"
"""A version string for the HTTPServer."""
software = None
diff --git a/release.py b/release.py
index ad05532e..ca501e27 100644
--- a/release.py
+++ b/release.py
@@ -15,7 +15,7 @@ import platform
import shutil
import importlib
-VERSION='3.2.5'
+VERSION='3.2.6'
if sys.version_info < (3,):
input = raw_input