From 87eccd3459ea2686e28bacae9a1dfc327869260f Mon Sep 17 00:00:00 2001
From: Wang <wangzl@amazon.com>
Date: Tue, 28 Jun 2022 20:29:40 -0700
Subject: [PATCH 1/2] Release commit for v2.10.0

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d806a88b..a4424ce9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,9 @@
 CHANGELOG
 =========
 
-Unreleased
+2.10.0
 ==========
+* 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
diff --git a/aws_xray_sdk/version.py b/aws_xray_sdk/version.py
index 59eb0ac8..5bed97f9 100644
--- a/aws_xray_sdk/version.py
+++ b/aws_xray_sdk/version.py
@@ -1 +1 @@
-VERSION = '2.9.0'
+VERSION = '2.10.0'
diff --git a/docs/conf.py b/docs/conf.py
index b576b0c1..2cc56f2b 100644
--- a/docs/conf.py
+++ b/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.

From 77c82d31549459ef4215034232ea770c14f7f917 Mon Sep 17 00:00:00 2001
From: Lei Wang <66336933+wangzlei@users.noreply.github.com>
Date: Wed, 29 Jun 2022 15:51:51 -0700
Subject: [PATCH 2/2] Update CHANGELOG.rst

---
 CHANGELOG.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a4424ce9..66d9b0f4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,8 +2,12 @@
 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>`_.