From 215576fa1b743018bf85d035fb8c5b7311dd3fc2 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sun, 4 Dec 2022 13:14:41 +0100
Subject: [PATCH] Release 2.5.0.

---
 CHANGELOG.rst                    | 18 ++++++++++++++++++
 changelogs/changelog.yaml        | 14 ++++++++++++++
 changelogs/fragments/137-api.yml |  5 -----
 changelogs/fragments/2.5.0.yml   |  1 -
 4 files changed, 32 insertions(+), 6 deletions(-)
 delete mode 100644 changelogs/fragments/137-api.yml
 delete mode 100644 changelogs/fragments/2.5.0.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 786f4fa7..7fc8d046 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,24 @@ Community RouterOS Release Notes
 .. contents:: Topics
 
 
+v2.5.0
+======
+
+Release Summary
+---------------
+
+Feature and bugfix release.
+
+Minor Changes
+-------------
+
+- api_info, api_modify - support API paths ``interface ethernet poe``, ``interface gre6``, ``interface vrrp`` and also support all previously missing fields of entries in ``ip dhcp-server`` (https://github.com/ansible-collections/community.routeros/pull/137).
+
+Bugfixes
+--------
+
+- api_modify - ``address-pool`` field of entries in API path ``ip dhcp-server`` is not required anymore (https://github.com/ansible-collections/community.routeros/pull/137).
+
 v2.4.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index a9bf925c..76493f3b 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -354,3 +354,17 @@ releases:
     - 134-command-safemode.yml
     - 2.4.0.yml
     release_date: '2022-11-18'
+  2.5.0:
+    changes:
+      bugfixes:
+      - api_modify - ``address-pool`` field of entries in API path ``ip dhcp-server``
+        is not required anymore (https://github.com/ansible-collections/community.routeros/pull/137).
+      minor_changes:
+      - api_info, api_modify - support API paths ``interface ethernet poe``, ``interface
+        gre6``, ``interface vrrp`` and also support all previously missing fields
+        of entries in ``ip dhcp-server`` (https://github.com/ansible-collections/community.routeros/pull/137).
+      release_summary: Feature and bugfix release.
+    fragments:
+    - 137-api.yml
+    - 2.5.0.yml
+    release_date: '2022-12-04'
diff --git a/changelogs/fragments/137-api.yml b/changelogs/fragments/137-api.yml
deleted file mode 100644
index 8372c297..00000000
--- a/changelogs/fragments/137-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-minor_changes:
-  - api_info, api_modify - support API paths ``interface ethernet poe``, ``interface gre6``, ``interface vrrp`` and also support all previously missing fields of entries in ``ip dhcp-server`` (https://github.com/ansible-collections/community.routeros/pull/137).
-bugfixes:
-  - api_modify - ``address-pool`` field of entries in API path ``ip dhcp-server`` is not required anymore (https://github.com/ansible-collections/community.routeros/pull/137).
diff --git a/changelogs/fragments/2.5.0.yml b/changelogs/fragments/2.5.0.yml
deleted file mode 100644
index 80287c3b..00000000
--- a/changelogs/fragments/2.5.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Feature and bugfix release.