From 1f84d0a317786f8e996c088ebc70be6aabeed873 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Thu, 15 Jun 2023 12:52:42 +0200
Subject: [PATCH] Release 2.14.0.

---
 CHANGELOG.rst                                  | 15 +++++++++++++++
 changelogs/changelog.yaml                      | 18 ++++++++++++++++++
 changelogs/fragments/2.14.0.yml                |  1 -
 changelogs/fragments/615-no-challenge.yml      |  4 ----
 .../617-acme_certificate-parallel.yml          |  2 --
 .../fragments/622-der-format-support.yml       |  2 --
 6 files changed, 33 insertions(+), 9 deletions(-)
 delete mode 100644 changelogs/fragments/2.14.0.yml
 delete mode 100644 changelogs/fragments/615-no-challenge.yml
 delete mode 100644 changelogs/fragments/617-acme_certificate-parallel.yml
 delete mode 100644 changelogs/fragments/622-der-format-support.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5d34de8a..940ed0c4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,21 @@ Community Crypto Release Notes
 .. contents:: Topics
 
 
+v2.14.0
+=======
+
+Release Summary
+---------------
+
+Feature release.
+
+Minor Changes
+-------------
+
+- acme_certificate - allow to use no challenge by providing ``no challenge`` for the ``challenge`` option. This is needed for ACME servers where validation is done without challenges (https://github.com/ansible-collections/community.crypto/issues/613, https://github.com/ansible-collections/community.crypto/pull/615).
+- acme_certificate - validate and wait for challenges in parallel instead handling them one after another (https://github.com/ansible-collections/community.crypto/pull/617).
+- x509_certificate_info - added support for certificates in DER format when using ``path`` parameter (https://github.com/ansible-collections/community.crypto/issues/603).
+
 v2.13.1
 =======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index da9e633b..ca735b39 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -840,6 +840,24 @@ releases:
     - 2.13.1.yml
     - 606-ee-rocky.yml
     release_date: '2023-05-21'
+  2.14.0:
+    changes:
+      minor_changes:
+      - acme_certificate - allow to use no challenge by providing ``no challenge``
+        for the ``challenge`` option. This is needed for ACME servers where validation
+        is done without challenges (https://github.com/ansible-collections/community.crypto/issues/613,
+        https://github.com/ansible-collections/community.crypto/pull/615).
+      - acme_certificate - validate and wait for challenges in parallel instead handling
+        them one after another (https://github.com/ansible-collections/community.crypto/pull/617).
+      - x509_certificate_info - added support for certificates in DER format when
+        using ``path`` parameter (https://github.com/ansible-collections/community.crypto/issues/603).
+      release_summary: Feature release.
+    fragments:
+    - 2.14.0.yml
+    - 615-no-challenge.yml
+    - 617-acme_certificate-parallel.yml
+    - 622-der-format-support.yml
+    release_date: '2023-06-15'
   2.2.0:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/2.14.0.yml b/changelogs/fragments/2.14.0.yml
deleted file mode 100644
index 512efc99..00000000
--- a/changelogs/fragments/2.14.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Feature release.
diff --git a/changelogs/fragments/615-no-challenge.yml b/changelogs/fragments/615-no-challenge.yml
deleted file mode 100644
index 2e6ba6a0..00000000
--- a/changelogs/fragments/615-no-challenge.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-minor_changes:
-  - "acme_certificate - allow to use no challenge by providing ``no challenge`` for the ``challenge`` option.
-     This is needed for ACME servers where validation is done without challenges
-     (https://github.com/ansible-collections/community.crypto/issues/613, https://github.com/ansible-collections/community.crypto/pull/615)."
diff --git a/changelogs/fragments/617-acme_certificate-parallel.yml b/changelogs/fragments/617-acme_certificate-parallel.yml
deleted file mode 100644
index a8104e8f..00000000
--- a/changelogs/fragments/617-acme_certificate-parallel.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - "acme_certificate - validate and wait for challenges in parallel instead handling them one after another (https://github.com/ansible-collections/community.crypto/pull/617)."
diff --git a/changelogs/fragments/622-der-format-support.yml b/changelogs/fragments/622-der-format-support.yml
deleted file mode 100644
index b4ba93e6..00000000
--- a/changelogs/fragments/622-der-format-support.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - "x509_certificate_info - added support for certificates in DER format when using ``path`` parameter (https://github.com/ansible-collections/community.crypto/issues/603)."