From 24b48852403ae3dd98b714f1914dd423c2c8ad68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Kr=C3=A1l?= Date: Tue, 10 Nov 2015 16:18:44 +0900 Subject: [PATCH] dev version bump --- Changelog.rst | 6 ++++++ docs/conf.py | 4 ++-- elasticsearch/__init__.py | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Changelog.rst b/Changelog.rst index 66d0a7ef..33dcc79c 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,6 +3,12 @@ Changelog ========= +2.2.0 (dev) +----------- + + * adding additional options for ssh - ``ssl_assert_hostname`` and + ``ssl_assert_fingerprint`` to the default connection class + 2.1.0 (2015-10-19) ------------------ diff --git a/docs/conf.py b/docs/conf.py index fbcb82b7..61c92174 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,9 +50,9 @@ copyright = u'2013, Honza Král' # built documents. # # The short X.Y version. -version = '2.1.0' +version = '2.2.0' # The full version, including alpha/beta/rc tags. -release = '2.1.0' +release = '2.2.0-dev' # 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 3fdf6092..141e01fa 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (2, 1, 0) +VERSION = (2, 2, 0, 'dev') __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index f3c79d0a..661ce148 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (2, 1, 0) +VERSION = (2, 2, 0, 'dev') __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))