From 96681819e89f1fbe677c47f6049c49e9b404616d Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Mon, 14 Jun 2021 17:41:42 -0500
Subject: [PATCH] New release v2.10.11rc1

---
 changelogs/CHANGELOG-v2.10.rst                | 23 ++++++++++++++++
 changelogs/changelog.yaml                     | 26 +++++++++++++++++++
 changelogs/fragments/v2.10.11rc1_summary.yaml |  3 +++
 lib/ansible/release.py                        |  2 +-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/v2.10.11rc1_summary.yaml

diff --git a/changelogs/CHANGELOG-v2.10.rst b/changelogs/CHANGELOG-v2.10.rst
index b81b7f0d5bc..f826ed46a6c 100644
--- a/changelogs/CHANGELOG-v2.10.rst
+++ b/changelogs/CHANGELOG-v2.10.rst
@@ -5,6 +5,29 @@ Ansible Base 2.10 "When the Levee Breaks" Release Notes
 .. contents:: Topics
 
 
+v2.10.11rc1
+===========
+
+Release Summary
+---------------
+
+| Release Date: 2021-06-14
+| `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+
+Security Fixes
+--------------
+
+- templating engine fix for not preserving usnafe status when trying to preserve newlines. CVE-2021-3583
+
+Bugfixes
+--------
+
+- gather_facts, package, service - fix using module_defaults for the modules in addition to the action plugins. (https://github.com/ansible/ansible/issues/72918)
+- psrp - Always cleanup the last run pipeline if a second pipeline is invoked to avoid violating any resource limits.
+- psrp - Fix error when resetting a connection that was initialised but not connected - (https://github.com/ansible/ansible/issues/74092).
+- psrp - Try to clean up any server-side resources when resetting a connection.
+
 v2.10.10
 ========
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index d611fee25a1..1d2f619761c 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1855,6 +1855,32 @@ releases:
     - template_temp_vars_fix.yml
     - v2.10.10rc1_summary.yaml
     release_date: '2021-05-17'
+  2.10.11rc1:
+    changes:
+      bugfixes:
+      - gather_facts, package, service - fix using module_defaults for the modules
+        in addition to the action plugins. (https://github.com/ansible/ansible/issues/72918)
+      - psrp - Always cleanup the last run pipeline if a second pipeline is invoked
+        to avoid violating any resource limits.
+      - psrp - Fix error when resetting a connection that was initialised but not
+        connected - (https://github.com/ansible/ansible/issues/74092).
+      - psrp - Try to clean up any server-side resources when resetting a connection.
+      release_summary: '| Release Date: 2021-06-14
+
+        | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
+
+        '
+      security_fixes:
+      - templating engine fix for not preserving usnafe status when trying to preserve
+        newlines. CVE-2021-3583
+    codename: When the Levee Breaks
+    fragments:
+    - 73864-action-plugin-module-defaults.yml
+    - fix_unsafe_newline.yml
+    - psrp-cleanup.yml
+    - psrp-reset.yml
+    - v2.10.11rc1_summary.yaml
+    release_date: '2021-06-14'
   2.10.1rc1:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/v2.10.11rc1_summary.yaml b/changelogs/fragments/v2.10.11rc1_summary.yaml
new file mode 100644
index 00000000000..82add365b6e
--- /dev/null
+++ b/changelogs/fragments/v2.10.11rc1_summary.yaml
@@ -0,0 +1,3 @@
+release_summary: |
+   | Release Date: 2021-06-14
+   | `Porting Guide <https://docs.ansible.com/ansible/devel/porting_guides.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index fb22eec70a8..b1ae1385202 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.10.post0'
+__version__ = '2.10.11rc1'
 __author__ = 'Ansible, Inc.'
 __codename__ = 'When the Levee Breaks'