diff --git a/Changelog.rst b/Changelog.rst index 77b7faba..c9828e45 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,6 +3,9 @@ Changelog ========= +1.2.0 (dev) +----------- + 1.1.0 (2014-07-02) ------------------ diff --git a/docs/conf.py b/docs/conf.py index ca048fb9..184f228d 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.1.0' +version = '1.2.0' # The full version, including alpha/beta/rc tags. -release = '1.1.0' +release = '1.2.0 (dev)' # 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 7e5e8ac1..999b0b62 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 1, 0) +VERSION = (1, 2, 0, 'dev') __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index e7750aba..683ae17a 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (1, 1, 0) +VERSION = (1, 2, 0, 'dev') __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))