From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 7 Feb 2015 18:15:19 +0000 (-0500)
Subject: Bump master branch version number
X-Git-Tag: v4.2.0b1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24b41e703ffcb66b25563222fb8e2a64313adfb1;p=thirdparty%2Ftornado.git

Bump master branch version number
---

diff --git a/setup.py b/setup.py
index 963a6ddc3..dcbb1bc82 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ http://api.mongodb.org/python/current/installation.html#osx
 
 kwargs = {}
 
-version = "4.1"
+version = "4.2.dev1"
 
 with open('README.rst') as f:
     kwargs['long_description'] = f.read()
diff --git a/tornado/__init__.py b/tornado/__init__.py
index 6f4f47d2d..01b926be2 100644
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -25,5 +25,5 @@ from __future__ import absolute_import, division, print_function, with_statement
 # is zero for an official release, positive for a development branch,
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version = "4.1"
-version_info = (4, 1, 0, 0)
+version = "4.2.dev1"
+version_info = (4, 2, 0, -100)