diff --git a/Changelog.rst b/Changelog.rst index de5663c0..4bee791a 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,15 +3,16 @@ Changelog ========= -1.4.0 (dev) ------------ +1.4.0 (2015-02-11) +------------------ * Using insecure SSL configuration (``verify_cert=False``) raises a warning - * ``reindex`` accepts a query parameter + * ``reindex`` accepts a ``query`` parameter * enable ``reindex`` helper to accept any kwargs for underlying ``bulk`` and ``scan`` calls * when doing an initial sniff (via ``sniff_on_start``) ignore special sniff timeout * option to treat ``TransportError`` as normal failure in ``bulk`` helpers + * fixed an issue with sniffing when only a single host was passed in 1.3.0 (2014-12-31) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 85f5dc4f..3efa2b21 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.4.0' # The full version, including alpha/beta/rc tags. -release = '1.4.0-dev' +release = '1.4.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 a9b93805..72674e1f 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 4, 0, 'dev') +VERSION = (1, 4, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 61ad949b..199d62d3 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (1, 4, 0, 'dev') +VERSION = (1, 4, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))