From dd03fdbc6a6cb2238bb187692f4717127651e940 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sun, 11 Apr 2021 16:06:02 +0200
Subject: [PATCH] Release 1.5.0.

---
 CHANGELOG.rst                                 | 23 +++++++++++++++++++
 changelogs/changelog.yaml                     | 17 ++++++++++++++
 changelogs/fragments/1.5.0.yml                |  1 -
 changelogs/fragments/114-use_ssh_client.yml   |  2 --
 .../fragments/121-exception-handling.yml      |  2 --
 5 files changed, 40 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/1.5.0.yml
 delete mode 100644 changelogs/fragments/114-use_ssh_client.yml
 delete mode 100644 changelogs/fragments/121-exception-handling.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bb4b2af5..b566ae34 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,29 @@ Docker Community Collection Release Notes
 .. contents:: Topics
 
 
+v1.5.0
+======
+
+Release Summary
+---------------
+
+Regular feature release.
+
+Minor Changes
+-------------
+
+- Add the ``use_ssh_client`` option to most docker modules and plugins (https://github.com/ansible-collections/community.docker/issues/108, https://github.com/ansible-collections/community.docker/pull/114).
+
+Bugfixes
+--------
+
+- all modules - use ``to_native`` to convert exceptions to strings (https://github.com/ansible-collections/community.docker/pull/121).
+
+New Modules
+-----------
+
+- docker_container_exec - Execute command in a docker container
+
 v1.4.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 437d6523..2d5c673d 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -262,3 +262,20 @@ releases:
     - 102-no_log-false.yml
     - 103-docker_swarm-join_token.yml
     release_date: '2021-03-14'
+  1.5.0:
+    changes:
+      bugfixes:
+      - all modules - use ``to_native`` to convert exceptions to strings (https://github.com/ansible-collections/community.docker/pull/121).
+      minor_changes:
+      - Add the ``use_ssh_client`` option to most docker modules and plugins (https://github.com/ansible-collections/community.docker/issues/108,
+        https://github.com/ansible-collections/community.docker/pull/114).
+      release_summary: Regular feature release.
+    fragments:
+    - 1.5.0.yml
+    - 114-use_ssh_client.yml
+    - 121-exception-handling.yml
+    modules:
+    - description: Execute command in a docker container
+      name: docker_container_exec
+      namespace: ''
+    release_date: '2021-04-11'
diff --git a/changelogs/fragments/1.5.0.yml b/changelogs/fragments/1.5.0.yml
deleted file mode 100644
index df0a1d75..00000000
--- a/changelogs/fragments/1.5.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Regular feature release.
\ No newline at end of file
diff --git a/changelogs/fragments/114-use_ssh_client.yml b/changelogs/fragments/114-use_ssh_client.yml
deleted file mode 100644
index 2150a1ea..00000000
--- a/changelogs/fragments/114-use_ssh_client.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-- "Add the ``use_ssh_client`` option to most docker modules and plugins (https://github.com/ansible-collections/community.docker/issues/108, https://github.com/ansible-collections/community.docker/pull/114)."
diff --git a/changelogs/fragments/121-exception-handling.yml b/changelogs/fragments/121-exception-handling.yml
deleted file mode 100644
index 28eefc40..00000000
--- a/changelogs/fragments/121-exception-handling.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- "all modules - use ``to_native`` to convert exceptions to strings (https://github.com/ansible-collections/community.docker/pull/121)."