summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelogs/CHANGELOG-v2.11.rst15
-rw-r--r--changelogs/changelog.yaml15
-rw-r--r--changelogs/fragments/v2.11.0rc2_summary.yaml3
-rw-r--r--lib/ansible/release.py2
4 files changed, 34 insertions, 1 deletions
diff --git a/changelogs/CHANGELOG-v2.11.rst b/changelogs/CHANGELOG-v2.11.rst
index e56cb8c63e..6953a2a246 100644
--- a/changelogs/CHANGELOG-v2.11.rst
+++ b/changelogs/CHANGELOG-v2.11.rst
@@ -5,6 +5,21 @@ ansible-core 2.11 "Hey Hey, What Can I Do" Release Notes
.. contents:: Topics
+v2.11.0rc2
+==========
+
+Release Summary
+---------------
+
+| Release Date: 2021-04-06
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Bugfixes
+--------
+
+- WorkerProcess - Python 3.5 fix for workaround for stdout deadlock in multiprocessing shutdown to avoid process hangs. (https://github.com/ansible/ansible/issues/74149)
+
v2.11.0rc1
==========
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 08ce98e2f0..213725c52d 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1621,3 +1621,18 @@ releases:
- v2.11.0rc1_summary.yaml
- workerprocess-stdout-deadlock.yml
release_date: '2021-04-05'
+ 2.11.0rc2:
+ changes:
+ bugfixes:
+ - WorkerProcess - Python 3.5 fix for workaround for stdout deadlock in multiprocessing
+ shutdown to avoid process hangs. (https://github.com/ansible/ansible/issues/74149)
+ release_summary: '| Release Date: 2021-04-06
+
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+ '
+ codename: Hey Hey, What Can I Do
+ fragments:
+ - fix-for-workerprocess-stdout-deadlock-fix.yml
+ - v2.11.0rc2_summary.yaml
+ release_date: '2021-04-06'
diff --git a/changelogs/fragments/v2.11.0rc2_summary.yaml b/changelogs/fragments/v2.11.0rc2_summary.yaml
new file mode 100644
index 0000000000..413a6335d4
--- /dev/null
+++ b/changelogs/fragments/v2.11.0rc2_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+ | Release Date: 2021-04-06
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 2389c10d53..eee5f19f46 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.11.0rc1.post0'
+__version__ = '2.11.0rc2'
__author__ = 'Ansible, Inc.'
__codename__ = 'Hey Hey, What Can I Do'