From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 12 Jun 2011 02:14:41 +0000 (-0700)
Subject: Bump version number to 2.0rc1.
X-Git-Tag: v2.0.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f52f686796aeb8265196dd3bf15f0a2b2b1bd72;p=thirdparty%2Ftornado.git

Bump version number to 2.0rc1.
---

diff --git a/setup.py b/setup.py
index 3e1ccdc34..4d731ca02 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 = "1.2.1"
+version = "2.0rc1"
 
 if major >= 3:
     import setuptools  # setuptools is required for use_2to3
diff --git a/tornado/__init__.py b/tornado/__init__.py
index 519285ef6..d7618b91a 100644
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -16,5 +16,5 @@
 
 """The Tornado web server and tools."""
 
-version = "1.2.1"
-version_info = (1, 2, 1)
+version = "2.0rc1"
+version_info = (2, 0, 0)