Merge pull request #2300 from bdarnell/release-5.0

Final release notes and version bump for 5.0
tornadoweb · Mar 5, 2018 · 3fc6aec · 3fc6aec
2 parents d6492cb + f08f2e8
commit 3fc6aec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docs/releases/v5.0.0.rst b/docs/releases/v5.0.0.rst
@@ -1,7 +1,7 @@
 What's new in Tornado 5.0
 =========================
 
-In progress
+Mar 5, 2018
 -----------
 
 Highlights
@@ -322,6 +322,8 @@ Other notes
   garbage collection.
 - `.RedirectHandler` now copies any query arguments from the request
   to the redirect location.
+- If both ``If-None-Match`` and ``If-Modified-Since`` headers are present
+  in a request to `.StaticFileHandler`, the latter is now ignored.
 
 `tornado.websocket`
 ~~~~~~~~~~~~~~~~~~~

diff --git a/setup.py b/setup.py
@@ -103,7 +103,7 @@ def build_extension(self, ext):
 
 kwargs = {}
 
-version = "5.0b1"
+version = "5.0"
 
 with open('README.rst') as f:
     kwargs['long_description'] = f.read()

diff --git a/tornado/__init__.py b/tornado/__init__.py
@@ -24,5 +24,5 @@
 # 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 = "5.0b1"
-version_info = (5, 0, 0, -98)
+version = "5.0"
+version_info = (5, 0, 0, 0)