Merge commit '02bc76155' into streambody

tornadoweb · Jan 31, 2012 · d53808f · d53808f
2 parents 5dfc231 + 02bc761
commit d53808f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
     extensions.append(distutils.core.Extension(
         "tornado.epoll", ["tornado/epoll.c"]))
 
-version = "2.1.1git"
+version = "2.2"
 
 if major >= 3:
     import setuptools  # setuptools is required for use_2to3

diff --git a/tornado/__init__.py b/tornado/__init__.py
@@ -23,5 +23,5 @@
 # is zero for an official release, positive for a development branch,
 # or negative for a release candidate (after the base version number
 # has been incremented)
-version = "2.1.1git"
-version_info = (2, 1, 1, 1)
+version = "2.2"
+version_info = (2, 2, 0, 0)
diff --git a/website/app.yaml b/website/app.yaml
@@ -1,14 +1,15 @@
 application: python-tornado
 version: 2
-runtime: python
+runtime: python27
+threadsafe: yes
 api_version: 1
 
 handlers:
 - url: /static/tornado-0.1.tar.gz
-  script: website.py
+  script: website.application
 
 - url: /static/tornado-0.2.tar.gz
-  script: website.py
+  script: website.application
 
 - url: /static/
   static_dir: static
@@ -22,10 +23,10 @@ handlers:
   upload: static/favicon.ico
 
 - url: /documentation/?
-  script: website.py
+  script: website.application
 
 - url: /documentation
   static_dir: sphinx/build/html
 
 - url: /.*
-  script: website.py
+  script: website.application
diff --git a/website/sphinx/releases.rst b/website/sphinx/releases.rst
@@ -4,7 +4,7 @@ Release notes
 .. toctree::
    :maxdepth: 2
 
-   releases/next
+   releases/v2.2.0
    releases/v2.1.1
    releases/v2.1.0
    releases/v2.0.0

diff --git a/website/sphinx/releases/next.rst → website/sphinx/releases/v2.2.0.rst b/website/sphinx/releases/next.rst → website/sphinx/releases/v2.2.0.rst
@@ -1,8 +1,16 @@
-What's new in the next release of Tornado
-=========================================
+What's new in Tornado 2.2
+=========================
 
-In progress
------------
+Jan 30, 2012
+------------
+
+Highlights
+~~~~~~~~~~
+
+* Updated and expanded WebSocket support.
+* Improved compatibility in the Twisted/Tornado bridge.
+* Template errors now generate better stack traces.
+* Better exception handling in `tornado.gen`.
 
 Security fixes
 ~~~~~~~~~~~~~~