From e3bfeeef2218e4b5844ef42a2a833cd2fce43ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Kr=C3=A1l?= <honza.kral@gmail.com>
Date: Wed, 31 Dec 2014 17:02:06 +0100
Subject: [PATCH] Version bump for 1.3 release

---
 Changelog.rst             | 10 ++++++----
 docs/conf.py              |  4 ++--
 elasticsearch/__init__.py |  2 +-
 setup.py                  |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Changelog.rst b/Changelog.rst
index 1f4d59b7..03d0d31a 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -3,18 +3,20 @@
 Changelog
 =========
 
-1.3.0 (dev)
------------
+1.3.0 (2014-12-31)
+------------------
 
  * Timeout now doesn't trigger a retry by default (can be overriden by setting
    ``retry_on_timeout=True``)
+ * Introduced new parameter ``retry_on_status`` (defaulting to ``(503, 504,
+   )``) controls which http status code should lead to a retry.
  * Implemented url parsing according to RFC-1738
- * added support for proper SSL certificate handling
+ * Added support for proper SSL certificate handling
  * Required parameters are now checked for non-empty values
  * ConnectionPool now checks if any connections were defined
  * DummyConnectionPool introduced when no load balancing is needed (only one
    connection defined)
- * fixed a race condition in ConnectionPool
+ * Fixed a race condition in ConnectionPool
 
 1.2.0 (2014-08-03)
 ------------------
diff --git a/docs/conf.py b/docs/conf.py
index 3ad6becb..0c45ae5a 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.2.0'
+version = '1.3.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.3.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 6bfc24f9..c809aed3 100644
--- a/elasticsearch/__init__.py
+++ b/elasticsearch/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-VERSION = (1, 2, 0)
+VERSION = (1, 3, 0)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))
 
diff --git a/setup.py b/setup.py
index c489c158..dc28c4ff 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)
+VERSION = (1, 3, 0)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))