From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 5 Mar 2018 01:43:52 +0000 (-0500)
Subject: Final release notes and version bump for 5.0
X-Git-Tag: v5.0.0^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2300%2Fhead;p=thirdparty%2Ftornado.git

Final release notes and version bump for 5.0
---

diff --git a/docs/releases/v5.0.0.rst b/docs/releases/v5.0.0.rst
index a3c473680..d55c21d36 100644
--- 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
index ae83143f6..b9a0b71dd 100644
--- a/setup.py
+++ b/setup.py
@@ -103,7 +103,7 @@ http://api.mongodb.org/python/current/installation.html#osx
 
 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
index 41d10ec29..73e991551 100644
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -24,5 +24,5 @@ from __future__ import absolute_import, division, print_function
 # 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)