From d6c20e76c6c5a6eb17e4ebf54ef516185282d724 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 14 Mar 2022 21:39:08 +0100
Subject: [PATCH] Release 2.2.1.

---
 CHANGELOG.rst                                       | 13 +++++++++++++
 changelogs/changelog.yaml                           | 10 ++++++++++
 changelogs/fragments/2.2.1.yml                      |  1 -
 .../305-docker_compose-errors-warnings.yml          |  2 --
 4 files changed, 23 insertions(+), 3 deletions(-)
 delete mode 100644 changelogs/fragments/2.2.1.yml
 delete mode 100644 changelogs/fragments/305-docker_compose-errors-warnings.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2abfdc1b..0f4cf8db 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,19 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v2.2.1
+======
+
+Release Summary
+---------------
+
+Regular bugfix release.
+
+Bugfixes
+--------
+
+- docker_compose - fix Python 3 type error when extracting warnings or errors from docker-compose's output (https://github.com/ansible-collections/community.docker/pull/305).
+
 v2.2.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 1d37448c..9190d000 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -549,3 +549,13 @@ releases:
     - 272-rolling-configs.yml
     - 292-docker-podman-compatibility.yml
     release_date: '2022-02-21'
+  2.2.1:
+    changes:
+      bugfixes:
+      - docker_compose - fix Python 3 type error when extracting warnings or errors
+        from docker-compose's output (https://github.com/ansible-collections/community.docker/pull/305).
+      release_summary: Regular bugfix release.
+    fragments:
+    - 2.2.1.yml
+    - 305-docker_compose-errors-warnings.yml
+    release_date: '2022-03-14'
diff --git a/changelogs/fragments/2.2.1.yml b/changelogs/fragments/2.2.1.yml
deleted file mode 100644
index 1b14bd80..00000000
--- a/changelogs/fragments/2.2.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular bugfix release.
diff --git a/changelogs/fragments/305-docker_compose-errors-warnings.yml b/changelogs/fragments/305-docker_compose-errors-warnings.yml
deleted file mode 100644
index 0ee0352e..00000000
--- a/changelogs/fragments/305-docker_compose-errors-warnings.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "docker_compose - fix Python 3 type error when extracting warnings or errors from docker-compose's output (https://github.com/ansible-collections/community.docker/pull/305)."