From bbf8373f6cb912d5006f44d298a80aa8f5337cb2 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 5 Feb 2021 17:52:24 +0100
Subject: [PATCH] Release 1.2.2.

---
 CHANGELOG.rst                                  | 13 +++++++++++++
 changelogs/changelog.yaml                      | 10 ++++++++++
 changelogs/fragments/1.2.2.yml                 |  1 -
 changelogs/fragments/CVE-2021-20191_no_log.yml |  2 --
 4 files changed, 23 insertions(+), 3 deletions(-)
 delete mode 100644 changelogs/fragments/1.2.2.yml
 delete mode 100644 changelogs/fragments/CVE-2021-20191_no_log.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 382302db..2a2b18f9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,19 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v1.2.2
+======
+
+Release Summary
+---------------
+
+Security bugfix release to address CVE-2021-20191.
+
+Security Fixes
+--------------
+
+- docker_swarm - enabled ``no_log`` for the option ``signing_ca_key`` to prevent accidental disclosure (CVE-2021-20191, https://github.com/ansible-collections/community.docker/pull/80).
+
 v1.2.1
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 97a0e03f..4a7c7148 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -181,3 +181,13 @@ releases:
     - 1.2.1.yml
     - 76-leading-v-support-in-docker-version.yml
     release_date: '2021-01-28'
+  1.2.2:
+    changes:
+      release_summary: Security bugfix release to address CVE-2021-20191.
+      security_fixes:
+      - docker_swarm - enabled ``no_log`` for the option ``signing_ca_key`` to prevent
+        accidental disclosure (CVE-2021-20191, https://github.com/ansible-collections/community.docker/pull/80).
+    fragments:
+    - 1.2.2.yml
+    - CVE-2021-20191_no_log.yml
+    release_date: '2021-02-05'
diff --git a/changelogs/fragments/1.2.2.yml b/changelogs/fragments/1.2.2.yml
deleted file mode 100644
index 51b14e7e..00000000
--- a/changelogs/fragments/1.2.2.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Security bugfix release to address CVE-2021-20191.
diff --git a/changelogs/fragments/CVE-2021-20191_no_log.yml b/changelogs/fragments/CVE-2021-20191_no_log.yml
deleted file mode 100644
index 0e94bc46..00000000
--- a/changelogs/fragments/CVE-2021-20191_no_log.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-security_fixes:
-  - docker_swarm - enabled ``no_log`` for the option ``signing_ca_key`` to prevent accidental disclosure (CVE-2021-20191, https://github.com/ansible-collections/community.docker/pull/80).