From 1848142d4f8d808245313671a678fdaf792d182a Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sat, 14 May 2022 12:11:04 +0200
Subject: [PATCH] Release 2.5.0.

---
 CHANGELOG.rst                                      | 14 ++++++++++++++
 changelogs/changelog.yaml                          | 13 +++++++++++++
 changelogs/fragments/2.5.0.yml                     |  1 -
 changelogs/fragments/344-adds-data-path-addr.yml   |  2 --
 .../345-docker_config-template-driver.yml          |  2 --
 5 files changed, 27 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/2.5.0.yml
 delete mode 100644 changelogs/fragments/344-adds-data-path-addr.yml
 delete mode 100644 changelogs/fragments/345-docker_config-template-driver.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 74ae99f7..5d2727f3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,20 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v2.5.0
+======
+
+Release Summary
+---------------
+
+Regular feature release.
+
+Minor Changes
+-------------
+
+- docker_config - add support for ``template_driver`` with one option ``golang`` (https://github.com/ansible-collections/community.docker/issues/332, https://github.com/ansible-collections/community.docker/pull/345).
+- docker_swarm - adds ``data_path_addr`` parameter during swarm initialization or when joining (https://github.com/ansible-collections/community.docker/issues/339).
+
 v2.4.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 6b8ca7f1..2ddc2c4d 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -609,3 +609,16 @@ releases:
     - 336-ee.yml
     - 337-container-output-from-local-logging-driver.yml
     release_date: '2022-04-25'
+  2.5.0:
+    changes:
+      minor_changes:
+      - docker_config - add support for ``template_driver`` with one option ``golang``
+        (https://github.com/ansible-collections/community.docker/issues/332, https://github.com/ansible-collections/community.docker/pull/345).
+      - docker_swarm - adds ``data_path_addr`` parameter during swarm initialization
+        or when joining (https://github.com/ansible-collections/community.docker/issues/339).
+      release_summary: Regular feature release.
+    fragments:
+    - 2.5.0.yml
+    - 344-adds-data-path-addr.yml
+    - 345-docker_config-template-driver.yml
+    release_date: '2022-05-14'
diff --git a/changelogs/fragments/2.5.0.yml b/changelogs/fragments/2.5.0.yml
deleted file mode 100644
index a5458b2c..00000000
--- a/changelogs/fragments/2.5.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular feature release.
diff --git a/changelogs/fragments/344-adds-data-path-addr.yml b/changelogs/fragments/344-adds-data-path-addr.yml
deleted file mode 100644
index a85634b4..00000000
--- a/changelogs/fragments/344-adds-data-path-addr.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - docker_swarm - adds ``data_path_addr`` parameter during swarm initialization or when joining (https://github.com/ansible-collections/community.docker/issues/339).
diff --git a/changelogs/fragments/345-docker_config-template-driver.yml b/changelogs/fragments/345-docker_config-template-driver.yml
deleted file mode 100644
index ba6e2894..00000000
--- a/changelogs/fragments/345-docker_config-template-driver.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - docker_config - add support for ``template_driver`` with one option ``golang`` (https://github.com/ansible-collections/community.docker/issues/332, https://github.com/ansible-collections/community.docker/pull/345).