From 1c7b23e2141c02e24a670fd93b033faf62943c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Kr=C3=A1l?= <honza.kral@gmail.com>
Date: Mon, 29 Feb 2016 22:44:24 +0100
Subject: [PATCH] version bump to 2.3.0

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

diff --git a/Changelog.rst b/Changelog.rst
index 5319d74ee7..ce27413e57 100644
--- a/Changelog.rst
+++ b/Changelog.rst
@@ -3,6 +3,12 @@
 Changelog
 =========
 
+2.3.0 (2016-02-29)
+------------------
+
+ * added ``client_key`` argument to configure client certificates
+ * debug logging now includes response body even for failed requests
+
 2.2.0 (2016-01-05)
 ------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index afbef48552..38b0b26d4c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -49,10 +49,12 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
+
+import elasticsearch
 # The short X.Y version.
-version = '2.2.0'
+version = elasticsearch.__versionstr__
 # The full version, including alpha/beta/rc tags.
-release = '2.2.0'
+release = version
 
 # 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 8f6e0af995..405bc21252 100644
--- a/elasticsearch/__init__.py
+++ b/elasticsearch/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-VERSION = (2, 2, 0)
+VERSION = (2, 3, 0)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))
 
diff --git a/setup.py b/setup.py
index e536bdebb6..ede23a09a3 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 import sys
 import os
 
-VERSION = (2, 2, 0)
+VERSION = (2, 3, 0)
 __version__ = VERSION
 __versionstr__ = '.'.join(map(str, VERSION))