diff --git a/Changelog.rst b/Changelog.rst index 980a974b..642f9b0a 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,6 +3,13 @@ Changelog ========= +1.7.0 (2015-09-21) +------------------ + + * elasticsearch 2.0 compatibility + * thrift now deprecated, to be remoeved in future version + * make sure urllib3 always uses keep-alive + 1.6.0 (2015-06-10) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 7a946ca5..fd47cd89 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 = '1.6.0' +version = '1.7.0' # The full version, including alpha/beta/rc tags. -release = '1.6.0' +release = '1.7.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 f4e1db01..a396d0f1 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 6, 0) +VERSION = (1, 7, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 8d224743..7d659324 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (1, 6, 0) +VERSION = (1, 7, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))