release commit for 1.1

aws · May 15, 2018 · 3c5d0eb · 3c5d0eb
1 parent 7a71da7
commit 3c5d0eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -1 +1 @@
-VERSION = '1.0'
+VERSION = '1.1'
diff --git 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.