From 3c5d0eb0f8425efb75556dffd2a1fc55e0eca179 Mon Sep 17 00:00:00 2001
From: Wu <haotianw@amazon.com>
Date: Tue, 15 May 2018 12:12:22 -0700
Subject: [PATCH] release commit for 1.1

---
 CHANGELOG.rst           | 11 +++++++----
 aws_xray_sdk/version.py |  2 +-
 docs/conf.py            |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f45291bc..4bb20f53 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,10 +2,13 @@
 CHANGELOG
 =========
 
-unreleased
-==========
-* feature: Added Sqlalchemy parameterized query capture. `PR34 <https://github.com/aws/aws-xray-sdk-python/pull/34>`_.
-* bugfix: Added new `raise_if_not_subsegment` parameter for Aiohttp Client tracing `PR58 <https://github.com/aws/aws-xray-sdk-python/pull/58>`_.
+1.1
+===
+* feature: Added Sqlalchemy parameterized query capture. `PR34 <https://github.com/aws/aws-xray-sdk-python/pull/34>`_
+* bugfix: Allow standalone sqlalchemy integrations without flask_sqlalchemy. `PR53 <https://github.com/aws/aws-xray-sdk-python/pull/53>`_
+* bugfix: Give up aiohttp client tracing when there is no open segment and LOG_ERROR is configured. `PR58 <https://github.com/aws/aws-xray-sdk-python/pull/58>`_
+* bugfix: Handle missing subsegment when rendering a Django template. `PR54 <https://github.com/aws/aws-xray-sdk-python/pull/54>`_
+* Typo fixes on comments and docs.
 
 1.0
 ===
diff --git a/aws_xray_sdk/version.py b/aws_xray_sdk/version.py
index a9fe5609..a57ff2b6 100644
--- a/aws_xray_sdk/version.py
+++ b/aws_xray_sdk/version.py
@@ -1 +1 @@
-VERSION = '1.0'
+VERSION = '1.1'
diff --git a/docs/conf.py b/docs/conf.py
index 704856a6..a3f4cd67 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.0'
+version = u'1.1'
 # The full version, including alpha/beta/rc tags.
-release = u'1.0'
+release = u'1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.