From ed52123206f1781992bd99e18b64b5c4e9c977ec Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 19 Sep 2022 20:46:26 +0200
Subject: [PATCH] Release 2.6.0.

---
 CHANGELOG.rst                                      | 14 ++++++++++++++
 changelogs/changelog.yaml                          | 12 ++++++++++++
 changelogs/fragments/2.6.0.yml                     |  1 -
 changelogs/fragments/508-acme-429.yml              |  2 --
 ...-openssh_keypair-private_key_format_options.yml |  4 ----
 5 files changed, 26 insertions(+), 7 deletions(-)
 delete mode 100644 changelogs/fragments/2.6.0.yml
 delete mode 100644 changelogs/fragments/508-acme-429.yml
 delete mode 100644 changelogs/fragments/511-openssh_keypair-private_key_format_options.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7a1f17a5..6e9f1f04 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,20 @@ Community Crypto Release Notes
 .. contents:: Topics
 
 
+v2.6.0
+======
+
+Release Summary
+---------------
+
+Feature release.
+
+Minor Changes
+-------------
+
+- acme* modules - support the HTTP 429 Too Many Requests response status (https://github.com/ansible-collections/community.crypto/pull/508).
+- openssh_keypair - added ``pkcs1``, ``pkcs8``, and ``ssh`` to the available choices for the ``private_key_format`` option (https://github.com/ansible-collections/community.crypto/pull/511).
+
 v2.5.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 2c5c16c6..a500be2a 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -953,3 +953,15 @@ releases:
     - 2.5.0.yml
     - 491-licenses.yml
     release_date: '2022-08-04'
+  2.6.0:
+    changes:
+      minor_changes:
+      - acme* modules - support the HTTP 429 Too Many Requests response status (https://github.com/ansible-collections/community.crypto/pull/508).
+      - openssh_keypair - added ``pkcs1``, ``pkcs8``, and ``ssh`` to the available
+        choices for the ``private_key_format`` option (https://github.com/ansible-collections/community.crypto/pull/511).
+      release_summary: Feature release.
+    fragments:
+    - 2.6.0.yml
+    - 508-acme-429.yml
+    - 511-openssh_keypair-private_key_format_options.yml
+    release_date: '2022-09-19'
diff --git a/changelogs/fragments/2.6.0.yml b/changelogs/fragments/2.6.0.yml
deleted file mode 100644
index 512efc99..00000000
--- a/changelogs/fragments/2.6.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Feature release.
diff --git a/changelogs/fragments/508-acme-429.yml b/changelogs/fragments/508-acme-429.yml
deleted file mode 100644
index 4c600ed7..00000000
--- a/changelogs/fragments/508-acme-429.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - "acme* modules - support the HTTP 429 Too Many Requests response status (https://github.com/ansible-collections/community.crypto/pull/508)."
diff --git a/changelogs/fragments/511-openssh_keypair-private_key_format_options.yml b/changelogs/fragments/511-openssh_keypair-private_key_format_options.yml
deleted file mode 100644
index e38bf47d..00000000
--- a/changelogs/fragments/511-openssh_keypair-private_key_format_options.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-minor_changes:
-  - "openssh_keypair - added ``pkcs1``, ``pkcs8``, and ``ssh`` to the available choices
-    for the ``private_key_format`` option
-    (https://github.com/ansible-collections/community.crypto/pull/511)."