From 32aabb8c4e4a9f22656ffec0fd953784e3075e33 Mon Sep 17 00:00:00 2001
From: Jonathan Lee <jjllee@amazon.com>
Date: Fri, 31 Mar 2023 13:24:31 -0700
Subject: [PATCH] Release commit for v2.12.0

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3dab014c..be677535 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,21 @@ CHANGELOG
 Unreleased
 ==========
 
+2.12.0
+==========
+* improvement: Default Context Missing Strategy set to Log Error `PR372 https://github.com/aws/aws-xray-sdk-python/pull/372`
+* bugfix: Pin tox version to <=3.27.1 to fix CI tests `PR374 https://github.com/aws/aws-xray-sdk-python/pull/374`
+* improvement: Sample app dependency update `PR373 https://github.com/aws/aws-xray-sdk-python/pull/373`
+* bugfix: Fix pynamodb tests for Python < 3.6 `PR375 https://github.com/aws/aws-xray-sdk-python/pull/375`
+* improvement: Use latest GH Actions versions in CI tests `PR365 https://github.com/aws/aws-xray-sdk-python/pull/365`
+* improvement: Simplify setup script `PR363 https://github.com/aws/aws-xray-sdk-python/pull/363`
+* bugfix: Fix deprecation warnings related to asyncio `PR364 https://github.com/aws/aws-xray-sdk-python/pull/364`
+* improvement: Run tests against Python 3.10 and 3.11 `PR376 https://github.com/aws/aws-xray-sdk-python/pull/376`
+* improvement: Sample app dependency update `PR380 https://github.com/aws/aws-xray-sdk-python/pull/380`
+* bugfix: Pin sqlalchemy version to 1.x to fix tests `PR381 https://github.com/aws/aws-xray-sdk-python/pull/381`
+* bugfix: Fix sample app dependencies incompatibility with XRay SDK `PR382 https://github.com/aws/aws-xray-sdk-python/pull/382`
+* bugfix: Start MySQL from GH Actions, upgrade Ubuntu, and remove Python versions for unit tests `PR384 https://github.com/aws/aws-xray-sdk-python/pull/384`
+
 2.11.0
 ==========
 * bugfix: Fix TypeError by patching register_default_jsonb from psycopg2 `PR350 https://github.com/aws/aws-xray-sdk-python/pull/350`
diff --git a/aws_xray_sdk/version.py b/aws_xray_sdk/version.py
index a13b4dce..2622af9b 100644
--- a/aws_xray_sdk/version.py
+++ b/aws_xray_sdk/version.py
@@ -1 +1 @@
-VERSION = '2.11.0'
+VERSION = '2.12.0'
diff --git a/docs/conf.py b/docs/conf.py
index 59c3e5de..c7fd8eb9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.11.0'
+version = u'2.12.0'
 # The full version, including alpha/beta/rc tags.
-release = u'2.11.0'
+release = u'2.12.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.