From 6621eb8b8765f66df8d780d85bd5a00b8638b2ea Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Wed, 14 Apr 2021 10:02:27 +0200
Subject: [PATCH] Release 2.5.1.

---
 CHANGELOG.rst                                 | 14 ++++++++++++++
 changelogs/changelog.yaml                     | 12 ++++++++++++
 changelogs/fragments/2.5.1.yml                |  1 -
 changelogs/fragments/2236-jira-isinstance.yml |  2 --
 changelogs/fragments/allow_funcd_to_load.yml  |  2 --
 5 files changed, 26 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/2.5.1.yml
 delete mode 100644 changelogs/fragments/2236-jira-isinstance.yml
 delete mode 100644 changelogs/fragments/allow_funcd_to_load.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6a49c310bb..81d8680cd9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,20 @@ Community General Release Notes
 
 This changelog describes changes after version 1.0.0.
 
+v2.5.1
+======
+
+Release Summary
+---------------
+
+Bugfix release for some bugs discovered right after the 2.5.0 release.
+
+Bugfixes
+--------
+
+- funcd connection plugin - can now load (https://github.com/ansible-collections/community.general/pull/2235).
+- jira - fixed calling of ``isinstance`` (https://github.com/ansible-collections/community.general/issues/2234).
+
 v2.5.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index ea969e2562..38de937216 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1804,3 +1804,15 @@ releases:
         name: path_join
         namespace: null
     release_date: '2021-04-13'
+  2.5.1:
+    changes:
+      bugfixes:
+      - funcd connection plugin - can now load (https://github.com/ansible-collections/community.general/pull/2235).
+      - jira - fixed calling of ``isinstance`` (https://github.com/ansible-collections/community.general/issues/2234).
+      release_summary: Bugfix release for some bugs discovered right after the 2.5.0
+        release.
+    fragments:
+    - 2.5.1.yml
+    - 2236-jira-isinstance.yml
+    - allow_funcd_to_load.yml
+    release_date: '2021-04-14'
diff --git a/changelogs/fragments/2.5.1.yml b/changelogs/fragments/2.5.1.yml
deleted file mode 100644
index 492d8ee272..0000000000
--- a/changelogs/fragments/2.5.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release for some bugs discovered right after the 2.5.0 release.
diff --git a/changelogs/fragments/2236-jira-isinstance.yml b/changelogs/fragments/2236-jira-isinstance.yml
deleted file mode 100644
index e80cbacdf9..0000000000
--- a/changelogs/fragments/2236-jira-isinstance.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - jira - fixed calling of ``isinstance`` (https://github.com/ansible-collections/community.general/issues/2234).
diff --git a/changelogs/fragments/allow_funcd_to_load.yml b/changelogs/fragments/allow_funcd_to_load.yml
deleted file mode 100644
index 3336b0aaf4..0000000000
--- a/changelogs/fragments/allow_funcd_to_load.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - funcd connection plugin - can now load (https://github.com/ansible-collections/community.general/pull/2235).