From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 27 May 2015 01:46:05 +0000 (-0400)
Subject: Set version number to 4.2.0
X-Git-Tag: v4.2.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdfaf3dffa49479c7461050eacca07bc5ee8d207;p=thirdparty%2Ftornado.git

Set version number to 4.2.0
---

diff --git a/docs/releases/v4.2.0.rst b/docs/releases/v4.2.0.rst
index 81476c0bd..2693b6531 100644
--- a/docs/releases/v4.2.0.rst
+++ b/docs/releases/v4.2.0.rst
@@ -1,8 +1,8 @@
 What's new in Tornado 4.2
 =========================
 
-In Progress
------------
+May 26, 2015
+------------
 
 Backwards-compatibility notes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/setup.py b/setup.py
index 8d98ff2c7..9b81b2b8b 100644
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@ http://api.mongodb.org/python/current/installation.html#osx
 
 kwargs = {}
 
-version = "4.2b1"
+version = "4.2"
 
 with open('README.rst') as f:
     kwargs['long_description'] = f.read()
diff --git a/tornado/__init__.py b/tornado/__init__.py
index 80f21ddd3..29e870411 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.2b1"
-version_info = (4, 2, 0, -99)
+version = "4.2"
+version_info = (4, 2, 0, 0)