Merge pull request #345 from wangzlei/master

Release commit for v2.10.0

Author: wangzlei

CHANGELOG.rst

@@ -4,6 +4,11 @@ CHANGELOG
 
 Unreleased
 ==========
+
+2.10.0
+==========
+* bugfix: Only import future for py2. `PR343 <https://github.com/aws/aws-xray-sdk-python/pull/343>`_.
+* bugfix: Defensively copy context entities to async thread. `PR340 <https://github.com/aws/aws-xray-sdk-python/pull/340>`_.
 * improvement: Added support for IGNORE_ERROR option when context is missing. `PR338 <https://github.com/aws/aws-xray-sdk-python/pull/338>`_.
 
 2.9.0

aws_xray_sdk/version.py

@@ -1 +1 @@
-VERSION = '2.9.0'
+VERSION = '2.10.0'

docs/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.9.0'
+version = u'2.10.0'
 # The full version, including alpha/beta/rc tags.
-release = u'2.9.0'
+release = u'2.10.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.