From bcd1201af659d01910789a6fa45a9ac13ee0c791 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Thu, 28 Jan 2021 07:43:11 +0100
Subject: [PATCH] Release 1.2.1.

---
 CHANGELOG.rst                                       | 13 +++++++++++++
 changelogs/changelog.yaml                           | 11 +++++++++++
 changelogs/fragments/1.2.1.yml                      |  1 -
 .../76-leading-v-support-in-docker-version.yml      |  2 --
 4 files changed, 24 insertions(+), 3 deletions(-)
 delete mode 100644 changelogs/fragments/1.2.1.yml
 delete mode 100644 changelogs/fragments/76-leading-v-support-in-docker-version.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1920b38e..382302db 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,19 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v1.2.1
+======
+
+Release Summary
+---------------
+
+Bugfix release.
+
+Bugfixes
+--------
+
+- docker connection plugin - fix Docker version parsing, as some docker versions have a leading ``v`` in the output of the command ``docker version --format "{{.Server.Version}}"`` (https://github.com/ansible-collections/community.docker/pull/76).
+
 v1.2.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 56fd323a..97a0e03f 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -170,3 +170,14 @@ releases:
     - 71-docker_container-default_host_ip.yml
     - 73-docker_image-fix-old-docker-py-version.yml
     release_date: '2021-01-25'
+  1.2.1:
+    changes:
+      bugfixes:
+      - docker connection plugin - fix Docker version parsing, as some docker versions
+        have a leading ``v`` in the output of the command ``docker version --format
+        "{{.Server.Version}}"`` (https://github.com/ansible-collections/community.docker/pull/76).
+      release_summary: Bugfix release.
+    fragments:
+    - 1.2.1.yml
+    - 76-leading-v-support-in-docker-version.yml
+    release_date: '2021-01-28'
diff --git a/changelogs/fragments/1.2.1.yml b/changelogs/fragments/1.2.1.yml
deleted file mode 100644
index 8ce9aa96..00000000
--- a/changelogs/fragments/1.2.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release.
diff --git a/changelogs/fragments/76-leading-v-support-in-docker-version.yml b/changelogs/fragments/76-leading-v-support-in-docker-version.yml
deleted file mode 100644
index 5ac004d3..00000000
--- a/changelogs/fragments/76-leading-v-support-in-docker-version.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - docker connection plugin - fix Docker version parsing, as some docker versions have a leading ``v`` in the output of the command ``docker version --format "{{.Server.Version}}"`` (https://github.com/ansible-collections/community.docker/pull/76).