Set version number to 2.2.

diff --git a/setup.py b/setup.py
index 9987bb16672d08fd4f324792c1b320bbf919803e..495459e7d6127023bb05fceb3c2302ea38b9bc19 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ if "linux" in sys.platform.lower() and not python_26:
     extensions.append(distutils.core.Extension(
         "tornado.epoll", ["tornado/epoll.c"]))
 
-version = "2.1.1git"
+version = "2.2"
 
 if major >= 3:
     import setuptools  # setuptools is required for use_2to3

diff --git a/tornado/__init__.py b/tornado/__init__.py
index d95c016cc28f47a8d75c4d3e591481c2bf2674a5..f13041e41ed9c1e7c59954bee78fe51d7ffbfe58 100644 (file)
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -23,5 +23,5 @@
 # is zero for an official release, positive for a development branch,
 # or negative for a release candidate (after the base version number
 # has been incremented)
-version = "2.1.1git"
-version_info = (2, 1, 1, 1)
+version = "2.2"
+version_info = (2, 2, 0, 0)