From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 30 Jan 2012 19:01:44 +0000 (-0800)
Subject: Set version number to 2.2.
X-Git-Tag: v2.2.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02bc76155de5bf4dca243e4d0c019c0ac4c8b3be;p=thirdparty%2Ftornado.git

Set version number to 2.2.
---

diff --git a/setup.py b/setup.py
index 9987bb166..495459e7d 100644
--- 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 d95c016cc..f13041e41 100644
--- 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)