diff --git a/.changes/1.25.42.json b/.changes/1.25.42.json new file mode 100644 index 000000000000..b6ee0d30da03 --- /dev/null +++ b/.changes/1.25.42.json @@ -0,0 +1,7 @@ +[ + { + "category": "TraceId", + "description": "Rollback bugfix for obeying _X_AMZN_TRACE_ID env var", + "type": "bugfix" + } +] \ No newline at end of file diff --git a/.changes/next-release/bugfix-TraceId-84961.json b/.changes/next-release/bugfix-TraceId-84961.json deleted file mode 100644 index 54e2c812ba07..000000000000 --- a/.changes/next-release/bugfix-TraceId-84961.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "bugfix", - "category": "TraceId", - "description": "Rollback bugfix for obeying _X_AMZN_TRACE_ID env var" -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index de587072d910..67d20c276f4d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,12 @@ CHANGELOG ========= +1.25.42 +======= + +* bugfix:TraceId: Rollback bugfix for obeying _X_AMZN_TRACE_ID env var + + 1.25.41 ======= diff --git a/awscli/__init__.py b/awscli/__init__.py index 1f76e5f6ac7c..8363aa08f0b8 100644 --- a/awscli/__init__.py +++ b/awscli/__init__.py @@ -17,7 +17,7 @@ """ import os -__version__ = '1.25.41' +__version__ = '1.25.42' # # Get our data path to be added to botocore's search path diff --git a/doc/source/conf.py b/doc/source/conf.py index d2e2efab82ba..28f1a58cb84f 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -52,7 +52,7 @@ # The short X.Y version. version = '1.25.' # The full version, including alpha/beta/rc tags. -release = '1.25.41' +release = '1.25.42' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.cfg b/setup.cfg index 7bb51cf84e72..75f83fcb6c03 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,7 +3,7 @@ universal = 0 [metadata] requires_dist = - botocore==1.27.41 + botocore==1.27.42 docutils>=0.10,<0.17 s3transfer>=0.6.0,<0.7.0 PyYAML>=3.10,<5.5 diff --git a/setup.py b/setup.py index f817bbf5dd82..146c531f6914 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ def find_version(*file_paths): install_requires = [ - 'botocore==1.27.41', + 'botocore==1.27.42', 'docutils>=0.10,<0.17', 's3transfer>=0.6.0,<0.7.0', 'PyYAML>=3.10,<5.5',