From ed8981f9bf929e8aa22f8d6bb2e0a7857830c7eb Mon Sep 17 00:00:00 2001
From: Petr Jasek <jasekpetr@gmail.com>
Date: Fri, 21 Jul 2017 09:38:57 +0200
Subject: [PATCH] release 2.2

---
 CHANGELOG.rst | 5 +++++
 setup.py      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d039e7e..b72fe9d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,11 @@
 Changelog
 ---------
 
+2.2 (2017-07-21)
+++++++++++++++++
+
+- add `ELASTICSEARCH_RETRY_ON_CONFLICT` setting
+
 2.1 (2017-03-27)
 ++++++++++++++++
 
diff --git a/setup.py b/setup.py
index ef33ab5..9e6eb58 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name='Eve-Elastic',
-    version='2.1',
+    version='2.2',
     description='Elasticsearch data layer for eve rest framework',
     long_description=readme + '\n\n' + changelog,
     license=license,