From e87b66b806b587e14e526735ca73d016f7a5f838 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 5 Jan 2022 22:33:40 +0100
Subject: [PATCH] Release 2.1.1.

---
 CHANGELOG.rst                                      | 13 +++++++++++++
 changelogs/changelog.yaml                          | 12 ++++++++++++
 changelogs/fragments/2.1.1.yml                     |  1 -
 changelogs/fragments/269-distutils-version-fix.yml |  2 --
 4 files changed, 25 insertions(+), 3 deletions(-)
 delete mode 100644 changelogs/fragments/2.1.1.yml
 delete mode 100644 changelogs/fragments/269-distutils-version-fix.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8af22f32..065281ad 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,19 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v2.1.1
+======
+
+Release Summary
+---------------
+
+Emergency release to amend breaking change in previous release.
+
+Bugfixes
+--------
+
+- Fix unintended breaking change caused by `an earlier fix <https://github.com/ansible-collections/community.docker/pull/258>`_ by vendoring the deprecated Python standard library ``distutils.version`` until this collection stops supporting Ansible 2.9 and ansible-base 2.10 (https://github.com/ansible-collections/community.docker/issues/267, https://github.com/ansible-collections/community.docker/pull/269).
+
 v2.1.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 1959a1f6..df74368c 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -513,3 +513,15 @@ releases:
     - 257-remove-distutils-spawn.yml
     - 258-distutils.version.yml
     release_date: '2022-01-04'
+  2.1.1:
+    changes:
+      bugfixes:
+      - Fix unintended breaking change caused by `an earlier fix <https://github.com/ansible-collections/community.docker/pull/258>`_
+        by vendoring the deprecated Python standard library ``distutils.version``
+        until this collection stops supporting Ansible 2.9 and ansible-base 2.10 (https://github.com/ansible-collections/community.docker/issues/267,
+        https://github.com/ansible-collections/community.docker/pull/269).
+      release_summary: Emergency release to amend breaking change in previous release.
+    fragments:
+    - 2.1.1.yml
+    - 269-distutils-version-fix.yml
+    release_date: '2022-01-05'
diff --git a/changelogs/fragments/2.1.1.yml b/changelogs/fragments/2.1.1.yml
deleted file mode 100644
index 4f945be8..00000000
--- a/changelogs/fragments/2.1.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Emergency release to amend breaking change in previous release.
diff --git a/changelogs/fragments/269-distutils-version-fix.yml b/changelogs/fragments/269-distutils-version-fix.yml
deleted file mode 100644
index a1ac3257..00000000
--- a/changelogs/fragments/269-distutils-version-fix.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "Fix unintended breaking change caused by `an earlier fix <https://github.com/ansible-collections/community.docker/pull/258>`_ by vendoring the deprecated Python standard library ``distutils.version`` until this collection stops supporting Ansible 2.9 and ansible-base 2.10 (https://github.com/ansible-collections/community.docker/issues/267, https://github.com/ansible-collections/community.docker/pull/269)."