From 5b0621692a9e83c5456ff82e04b5e3d6b9243e43 Mon Sep 17 00:00:00 2001
From: Zaar Hai <haizaar@haizaar.com>
Date: Sun, 20 Sep 2015 16:11:23 +0300
Subject: [PATCH] Going 2.2.0

---
 changelog.rst | 10 ++++++++++
 docs/conf.py  |  4 ++--
 setup.py      |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/changelog.rst b/changelog.rst
index 27427eb..6557c1f 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+2.2.0 (2015-09-20)
+------------------
+*  Fixed serious flaw with connection retrials. `More details`_.
+*  Fixed ping to handle failures properly (`issue 115`_).
+*  NOTE: gcc is now required to run tests - we supply built-in version of `tcproxy`_ for connection failure simulation.
+
+.. _More details: https://github.com/FSX/momoko/commit/85183f5370181f75a29e876f5211d99c40b4ba5e
+.. _issue 115: https://github.com/FSX/momoko/issues/115
+.. _tcproxy: https://github.com/dccmx/tcproxy
+
 2.1.1 (2015-08-03)
 ------------------
 *  Fixed JSON/HSTORE support with named cursors (`issue 112`_). Thanks to helminster_.
diff --git a/docs/conf.py b/docs/conf.py
index b75330a..1d93810 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.1.1'
+version = '2.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.1'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 7cf288d..cf967a2 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
 
 setup(
     name='Momoko',
-    version='2.1.1',
+    version='2.2.0',
     description="Momoko wraps Psycopg2's functionality for use in Tornado.",
     long_description=open('README.rst').read(),
     author='Frank Smit & Zaar Hai',