release 2.2

superdesk · Jul 21, 2017 · ed8981f · ed8981f
1 parent d28c628
commit ed8981f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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,