diff --git a/Changelog.rst b/Changelog.rst index 753ded1d..66d0a7ef 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,6 +3,11 @@ Changelog ========= +2.1.0 (2015-10-19) +------------------ + + * move multiprocessing import inside parallel bulk for Google App Engine + 2.0.0 (2015-10-14) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 82fcd67d..fbcb82b7 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.0.0' +version = '2.1.0' # The full version, including alpha/beta/rc tags. -release = '2.0.0' +release = '2.1.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 f893a862..3fdf6092 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (2, 0, 0) +VERSION = (2, 1, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 5afdf984..f3c79d0a 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (2, 0, 0) +VERSION = (2, 1, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))