From 6bd5eee9b098189d0e0506a3527e010111253b85 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sun, 29 Oct 2023 15:59:31 +0100
Subject: [PATCH] Release 2.16.0.

---
 CHANGELOG.rst                                  | 18 ++++++++++++++++++
 changelogs/changelog.yaml                      | 14 ++++++++++++++
 changelogs/fragments/2.16.0.yml                |  1 -
 .../fragments/664-luks_device-keyslot.yml      |  2 --
 changelogs/fragments/pkcs12.yml                |  2 --
 5 files changed, 32 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/2.16.0.yml
 delete mode 100644 changelogs/fragments/664-luks_device-keyslot.yml
 delete mode 100644 changelogs/fragments/pkcs12.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4ed56053..58b33005 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,24 @@ Community Crypto Release Notes
 .. contents:: Topics
 
 
+v2.16.0
+=======
+
+Release Summary
+---------------
+
+Bugfix release.
+
+Minor Changes
+-------------
+
+- luks_devices - add new options ``keyslot``, ``new_keyslot``, and ``remove_keyslot`` to allow adding/removing keys to/from specific keyslots (https://github.com/ansible-collections/community.crypto/pull/664).
+
+Bugfixes
+--------
+
+- openssl_pkcs12 - modify autodetect to not detect pyOpenSSL >= 23.3.0, which removed PKCS#12 support (https://github.com/ansible-collections/community.crypto/pull/666).
+
 v2.15.1
 =======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index aa2954f5..61089f22 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -934,6 +934,20 @@ releases:
     - 2.15.1.yml
     - 652-problem-type.yml
     release_date: '2023-08-22'
+  2.16.0:
+    changes:
+      bugfixes:
+      - openssl_pkcs12 - modify autodetect to not detect pyOpenSSL >= 23.3.0, which
+        removed PKCS#12 support (https://github.com/ansible-collections/community.crypto/pull/666).
+      minor_changes:
+      - luks_devices - add new options ``keyslot``, ``new_keyslot``, and ``remove_keyslot``
+        to allow adding/removing keys to/from specific keyslots (https://github.com/ansible-collections/community.crypto/pull/664).
+      release_summary: Bugfix release.
+    fragments:
+    - 2.16.0.yml
+    - 664-luks_device-keyslot.yml
+    - pkcs12.yml
+    release_date: '2023-10-29'
   2.2.0:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/2.16.0.yml b/changelogs/fragments/2.16.0.yml
deleted file mode 100644
index 8ce9aa96..00000000
--- a/changelogs/fragments/2.16.0.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release.
diff --git a/changelogs/fragments/664-luks_device-keyslot.yml b/changelogs/fragments/664-luks_device-keyslot.yml
deleted file mode 100644
index 61b17cf9..00000000
--- a/changelogs/fragments/664-luks_device-keyslot.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - "luks_devices - add new options ``keyslot``, ``new_keyslot``, and ``remove_keyslot`` to allow adding/removing keys to/from specific keyslots (https://github.com/ansible-collections/community.crypto/pull/664)."
diff --git a/changelogs/fragments/pkcs12.yml b/changelogs/fragments/pkcs12.yml
deleted file mode 100644
index b3424ece..00000000
--- a/changelogs/fragments/pkcs12.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "openssl_pkcs12 - modify autodetect to not detect pyOpenSSL >= 23.3.0, which removed PKCS#12 support (https://github.com/ansible-collections/community.crypto/pull/666)."