diff --git a/Changelog.rst b/Changelog.rst index c9828e45..fe2f3eba 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,8 +3,18 @@ Changelog ========= -1.2.0 (dev) ------------ +1.2.0 (2014-08-03) +------------------ + +Compatibility with newest (1.3) Elasticsearch APIs. + + * Filter out master-only nodes when sniffing + * Improved docs and error messages + +1.1.1 (2014-07-04) +------------------ + +Bugfix release fixing escaping issues with `request_timeout`. 1.1.0 (2014-07-02) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 184f228d..3ad6becb 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 = '1.2.0' # The full version, including alpha/beta/rc tags. -release = '1.2.0 (dev)' +release = '1.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 999b0b62..4a447839 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 2, 0, 'dev') +VERSION = (1, 2, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 683ae17a..c489c158 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (1, 2, 0, 'dev') +VERSION = (1, 2, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))