diff --git a/Changelog.rst b/Changelog.rst index e88975ae..973d1ef9 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -6,6 +6,11 @@ Changelog 6.1.0 (dev) ----------- +6.1.1 (2017-01-05) +------------------ + * Updates to SSLContext logic to make it easier to use and have saner defaults. + * Doc updates + 6.0.0 (2017-11-14) ------------------ @@ -60,7 +65,7 @@ Version compatible with elasticsearch 5.0 connection classes need to be updated * added ``headers`` arg to connections to support custom http headers * passing in a keyword parameter with ``None`` as value will cause that param - to be ignored + to be ignored 2.4.0 (2016-08-17) ------------------ @@ -223,7 +228,7 @@ compatible with 0.90 elasticsearch. 0.4.2 (2013-10-08) ------------------ - + * ``ignore`` param accepted by all APIs * Fixes to ``helpers.bulk_index`` diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py index 0598a9c7..c10d49ed 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (6, 1, 0, 'dev') +VERSION = (6, 1, 1) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index d966ed37..504e8867 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from os.path import join, dirname from setuptools import setup, find_packages import sys -VERSION = (6, 1, 0, 'dev') +VERSION = (6, 1, 1) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))