release 2.2.0

Author: takluyver

.mailmap

@@ -71,6 +71,7 @@ Jörgen Stenarson <[email protected]> jstenar <>
 Jörgen Stenarson <[email protected]> Jörgen Stenarson <[email protected]>
 Juergen Hasch <[email protected]> juhasch <[email protected]>
 Kyle Kelley <[email protected]> Kyle Kelley <[email protected]>
+Kyle Kelley <[email protected]> rgbkrk <[email protected]>
 Laurent Dufréchou <[email protected]> <[email protected]>
 Laurent Dufréchou <[email protected]> <laurent@Pep>
 Laurent Dufréchou <[email protected]> laurent dufrechou <>
@@ -105,6 +106,7 @@ Robert Kern <[email protected]> Robert Kern <>
 Robert Marchman <[email protected]> Robert Marchman <[email protected]>
 Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
+Shayne Hodge <[email protected]> unknown <[email protected]>
 smithj1 <[email protected]> smithj1 <[email protected]>
 smithj1 <[email protected]> smithj1 <[email protected]>
 Steven Johnson <[email protected]> stevenJohnson <[email protected]>
@@ -127,4 +129,4 @@ Ville M. Vainio <[email protected]> Ville M. Vainio <vivainio@ville_vmw>
 Walter Doerwald <[email protected]> walter.doerwald <>
 Walter Doerwald <[email protected]> Walter Doerwald <>
 W. Trevor King <[email protected]> W. Trevor King <[email protected]>
-Yoval P. <[email protected]> y-p <[email protected]>
+Yoval P. <[email protected]> y-p <[email protected]>

IPython/core/release.py

@@ -24,7 +24,7 @@
 _version_patch = 0
 _version_extra = 'maint'
 # _version_extra = 'rc1'
-# _version_extra = ''  # Uncomment this for full releases
+_version_extra = ''  # Uncomment this for full releases
 
 # release.codename is deprecated in 2.0, will be removed in 3.0
 codename = ''

IPython/html/static/base/js/namespace.js

@@ -7,7 +7,7 @@
 
 var IPython = IPython || {};
 
-IPython.version = "2.2.0-maint";
+IPython.version = "2.2.0";
 
 IPython.namespace = function (ns_string) {
     "use strict";

docs/source/whatsnew/github-stats-2.0.rst

@@ -1,8 +1,75 @@
 .. _issues_list_200:
 
-Issues closed in the 2.0 development cycle
+Issues closed in the 2.x development cycle
 ==========================================
 
+Issues closed in 2.2.0
+----------------------
+
+GitHub stats for 2014/05/21 - 2014/08/06 (tag: rel-2.1.0)
+
+These lists are automatically generated, and may be incomplete or contain duplicates.
+
+The following 13 authors contributed 36 commits.
+
+* Adam Hodgen
+* Benjamin Ragan-Kelley
+* Björn Grüning
+* Dara Adib
+* Eric Galloway
+* Jonathan Frederic
+* Kyle Kelley
+* Matthias Bussonnier
+* Paul Ivanov
+* Shayne Hodge
+* Steven Anton
+* Thomas Kluyver
+* Zahari
+
+We closed 23 issues and merged 11 pull requests;
+this is the full list (generated with the script 
+:file:`tools/github_stats.py`):
+
+Pull Requests (23):
+
+* :ghpull:`6279`: minor updates to release scripts
+* :ghpull:`6273`: Upgrade default mathjax version.
+* :ghpull:`6249`: always use HTTPS getting mathjax from CDN
+* :ghpull:`6114`: update hmac signature comparison
+* :ghpull:`6195`: Close handle on new temporary files before returning filename
+* :ghpull:`6143`: pin tornado to < 4 on travis js tests
+* :ghpull:`6134`: remove rackcdn https workaround for mathjax cdn
+* :ghpull:`6120`: Only allow iframe embedding on same origin.
+* :ghpull:`6117`: Remove / from route of TreeRedirectHandler.
+* :ghpull:`6105`: only set allow_origin_pat if defined
+* :ghpull:`6102`: Add newline if missing to end of script magic cell
+* :ghpull:`6077`: allow unicode keys in dicts in json_clean
+* :ghpull:`6061`: make CORS configurable
+* :ghpull:`6081`: don’t modify dict keys while iterating through them
+* :ghpull:`5803`: unify visual line handling
+* :ghpull:`6005`: Changed right arrow key movement function to mirror left arrow key
+* :ghpull:`6029`: add pickleutil.PICKLE_PROTOCOL
+* :ghpull:`6003`: Set kernel_id before checking websocket
+* :ghpull:`5994`: Fix ssh tunnel for Python3
+* :ghpull:`5973`: Do not create checkpoint_dir relative to current dir
+* :ghpull:`5933`: fix qt_loader import hook signature
+* :ghpull:`5944`: Markdown rendering bug fix.
+* :ghpull:`5917`: use shutil.move instead of os.rename
+
+Issues (11):
+
+* :ghissue:`6246`: Include MathJax by default or access the CDN over a secure connection
+* :ghissue:`5525`: Websocket origin check fails when used with Apache WS proxy
+* :ghissue:`5901`: 2 test failures in Python 3.4 in parallel group
+* :ghissue:`5926`: QT console: text selection cannot be made from left to right with keyboard
+* :ghissue:`5998`: use_dill does not work in Python 3.4
+* :ghissue:`5964`: Traceback on Qt console exit
+* :ghissue:`5787`: Error in Notebook-Generated latex (nbconvert)
+* :ghissue:`5950`: qtconsole truncates help
+* :ghissue:`5943`: 2.x: notebook fails to load when using HTML comments
+* :ghissue:`5932`: Qt ImportDenier Does Not Adhere to PEP302
+* :ghissue:`5898`: OSError when moving configuration file
+
 Issues closed in 2.1.0
 ----------------------