diff --git a/changelogs/CHANGELOG-v2.10.rst b/changelogs/CHANGELOG-v2.10.rst index 534b14d561b..0eac3697ea2 100644 --- a/changelogs/CHANGELOG-v2.10.rst +++ b/changelogs/CHANGELOG-v2.10.rst @@ -5,13 +5,13 @@ Ansible Base 2.10 "When the Levee Breaks" Release Notes .. contents:: Topics -v2.10.4rc1 -========== +v2.10.4 +======= Release Summary --------------- -| Release Date: 2020-12-07 +| Release Date: 2020-12-14 | `Porting Guide `__ @@ -43,6 +43,7 @@ Bugfixes - account for bug in Python 2.6 that occurs during interpreter shutdown to avoid stack trace - ansible-test - Correctly detect changes in a GitHub pull request when running on Azure Pipelines. - ansible-test - Skip installing requirements if they are already installed. +- ansible-test - ``cryptography`` is now limited to versions prior to 3.2 only when an incompatible OpenSSL version (earlier than 1.1.0) is detected - ansible-test - add constraint for ``cffi`` to prevent failure on systems with older versions of ``gcc`` (https://foss.heptapod.net/pypy/cffi/-/issues/480) - ansible-test - convert target paths to unicode on Python 2 to avoid ``UnicodeDecodeError`` (https://github.com/ansible/ansible/issues/68398, https://github.com/ansible/ansible/pull/72623). - ansible-test - improve classification of changes to ``.gitignore``, ``COPYING``, ``LICENSE``, ``Makefile``, and all files ending with one of ``.in`, ``.md`, ``.rst``, ``.toml``, ``.txt`` in the collection root directory (https://github.com/ansible/ansible/pull/72353). diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index b782f211e94..73aa9bb196e 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -2129,6 +2129,21 @@ releases: - url-lookup-ini.yml - v2.10.3rc1_summary.yaml release_date: '2020-10-26' + 2.10.4: + changes: + bugfixes: + - ansible-test - ``cryptography`` is now limited to versions prior to 3.2 only + when an incompatible OpenSSL version (earlier than 1.1.0) is detected + release_summary: '| Release Date: 2020-12-14 + + | `Porting Guide `__ + + ' + codename: When the Levee Breaks + fragments: + - ansible-test-constraints-cryptography.yml + - v2.10.4_summary.yaml + release_date: '2020-12-14' 2.10.4rc1: changes: bugfixes: diff --git a/changelogs/fragments/v2.10.4_summary.yaml b/changelogs/fragments/v2.10.4_summary.yaml new file mode 100644 index 00000000000..5898e9e5eab --- /dev/null +++ b/changelogs/fragments/v2.10.4_summary.yaml @@ -0,0 +1,3 @@ +release_summary: | + | Release Date: 2020-12-14 + | `Porting Guide `__ diff --git a/lib/ansible/release.py b/lib/ansible/release.py index 286a58e4e0e..e15e306ebaa 100644 --- a/lib/ansible/release.py +++ b/lib/ansible/release.py @@ -19,6 +19,6 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -__version__ = '2.10.4rc1.post0' +__version__ = '2.10.4' __author__ = 'Ansible, Inc.' __codename__ = 'When the Levee Breaks'