summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2020-09-01 01:01:32 -0500
committerRick Elrod <rick@elrod.me>2020-09-01 01:01:32 -0500
commit0e68601002de5e4e0b06dde6a8f737ebd3312349 (patch)
treefdf80c81dce5d42b732e94d943610581e0041a34
parent9a48ffd61b6ed88abbf793ff195e2a7cf51ffce1 (diff)
downloadansible-0e68601002de5e4e0b06dde6a8f737ebd3312349.tar.gz
New release v2.10.1rc2v2.10.1rc2
-rw-r--r--changelogs/CHANGELOG-v2.10.rst15
-rw-r--r--changelogs/changelog.yaml16
-rw-r--r--changelogs/fragments/v2.10.1rc2_summary.yaml3
-rw-r--r--lib/ansible/release.py2
4 files changed, 35 insertions, 1 deletions
diff --git a/changelogs/CHANGELOG-v2.10.rst b/changelogs/CHANGELOG-v2.10.rst
index 34d4b940e1..db27c6156f 100644
--- a/changelogs/CHANGELOG-v2.10.rst
+++ b/changelogs/CHANGELOG-v2.10.rst
@@ -5,6 +5,21 @@ Ansible Base 2.10 "When the Levee Breaks" Release Notes
.. contents:: Topics
+v2.10.1rc2
+==========
+
+Release Summary
+---------------
+
+| Release Date: 2020-09-01
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Security Fixes
+--------------
+
+- The fix for CVE-2020-1736 has been reverted. Users are encouraged to specify a ``mode`` parameter in their file-based tasks when the files being manipulated contain sensitive data.
+
v2.10.1rc1
==========
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 46a88a020d..30ce606fb1 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1918,3 +1918,19 @@ releases:
- unarchive-check-future-gid-against-run-gid.yml
- v2.10.1rc1_summary.yaml
release_date: '2020-08-31'
+ 2.10.1rc2:
+ changes:
+ release_summary: '| Release Date: 2020-09-01
+
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+ '
+ security_fixes:
+ - The fix for CVE-2020-1736 has been reverted. Users are encouraged to specify
+ a ``mode`` parameter in their file-based tasks when the files being manipulated
+ contain sensitive data.
+ codename: When the Levee Breaks
+ fragments:
+ - cve-2020-1736-revert.yml
+ - v2.10.1rc2_summary.yaml
+ release_date: '2020-09-01'
diff --git a/changelogs/fragments/v2.10.1rc2_summary.yaml b/changelogs/fragments/v2.10.1rc2_summary.yaml
new file mode 100644
index 0000000000..f3cd3c3a1d
--- /dev/null
+++ b/changelogs/fragments/v2.10.1rc2_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+ | Release Date: 2020-09-01
+ | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 35f4487323..f34e47ffdc 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.1rc1'
+__version__ = '2.10.1rc2'
__author__ = 'Ansible, Inc.'
__codename__ = 'When the Levee Breaks'