From 51defea8c9e1f5d664c879071d027cd5761630ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Tue, 5 Jan 2016 12:01:57 +0100 Subject: [PATCH] Version bump --- Changelog.rst | 5 +++-- docs/conf.py | 2 +- elasticsearch/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index 33dcc79c..e92824d7 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,11 +3,12 @@ Changelog ========= -2.2.0 (dev) ------------ +2.2.0 (2016-01-05) +------------------ * adding additional options for ssh - ``ssl_assert_hostname`` and ``ssl_assert_fingerprint`` to the default connection class + * fix sniffing 2.1.0 (2015-10-19) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 34ed5e59..afbef485 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ copyright = u'2013, Honza Král' # The short X.Y version. version = '2.2.0' # The full version, including alpha/beta/rc tags. -release = '2.2.0-dev' +release = '2.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py index 141e01fa..8f6e0af9 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (2, 2, 0, 'dev') +VERSION = (2, 2, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 661ce148..e536bdeb 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (2, 2, 0, 'dev') +VERSION = (2, 2, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))