From a861149a0ea2c4097f1866b9997513a811aad230 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Thu, 1 Jul 2021 19:55:52 +0200
Subject: [PATCH] Release 3.3.1.

---
 CHANGELOG.rst                                    | 15 +++++++++++++++
 changelogs/changelog.yaml                        | 16 ++++++++++++++++
 ...-2-identical-executions-in-same-auth-flow.yml |  3 ---
 changelogs/fragments/2912-snap-module-helper.yml |  3 ---
 changelogs/fragments/3.3.1.yml                   |  1 -
 5 files changed, 31 insertions(+), 7 deletions(-)
 delete mode 100644 changelogs/fragments/2904-fix-bug-when-2-identical-executions-in-same-auth-flow.yml
 delete mode 100644 changelogs/fragments/2912-snap-module-helper.yml
 delete mode 100644 changelogs/fragments/3.3.1.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 66b836a285..b42daca80d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,21 @@ Community General Release Notes
 
 This changelog describes changes after version 2.0.0.
 
+v3.3.1
+======
+
+Release Summary
+---------------
+
+Extraordinary bugfix release to fix a fatal bug in ``snap``.
+
+Bugfixes
+--------
+
+- keycloak_authentication - fix bug when two identical executions are in the same authentication flow (https://github.com/ansible-collections/community.general/pull/2904).
+- module_helper module utils - avoid failing when non-zero ``rc`` is present on regular exit (https://github.com/ansible-collections/community.general/pull/2912).
+- snap - fix various bugs which prevented the module from working at all, and which resulted in ``state=absent`` fail on absent snaps (https://github.com/ansible-collections/community.general/issues/2835, https://github.com/ansible-collections/community.general/issues/2906, https://github.com/ansible-collections/community.general/pull/2912).
+
 v3.3.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 9cb322e932..8879005e83 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1392,3 +1392,19 @@ releases:
       name: keycloak_authentication
       namespace: identity.keycloak
     release_date: '2021-06-29'
+  3.3.1:
+    changes:
+      bugfixes:
+      - keycloak_authentication - fix bug when two identical executions are in the
+        same authentication flow (https://github.com/ansible-collections/community.general/pull/2904).
+      - module_helper module utils - avoid failing when non-zero ``rc`` is present
+        on regular exit (https://github.com/ansible-collections/community.general/pull/2912).
+      - snap - fix various bugs which prevented the module from working at all, and
+        which resulted in ``state=absent`` fail on absent snaps (https://github.com/ansible-collections/community.general/issues/2835,
+        https://github.com/ansible-collections/community.general/issues/2906, https://github.com/ansible-collections/community.general/pull/2912).
+      release_summary: Extraordinary bugfix release to fix a fatal bug in ``snap``.
+    fragments:
+    - 2904-fix-bug-when-2-identical-executions-in-same-auth-flow.yml
+    - 2912-snap-module-helper.yml
+    - 3.3.1.yml
+    release_date: '2021-07-01'
diff --git a/changelogs/fragments/2904-fix-bug-when-2-identical-executions-in-same-auth-flow.yml b/changelogs/fragments/2904-fix-bug-when-2-identical-executions-in-same-auth-flow.yml
deleted file mode 100644
index 21fde3eb58..0000000000
--- a/changelogs/fragments/2904-fix-bug-when-2-identical-executions-in-same-auth-flow.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - keycloak_authentication - fix bug when two identical executions are in the same authentication flow
-    (https://github.com/ansible-collections/community.general/pull/2904).
diff --git a/changelogs/fragments/2912-snap-module-helper.yml b/changelogs/fragments/2912-snap-module-helper.yml
deleted file mode 100644
index cb9935a5e4..0000000000
--- a/changelogs/fragments/2912-snap-module-helper.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-bugfixes:
-  - module_helper module utils - avoid failing when non-zero ``rc`` is present on regular exit (https://github.com/ansible-collections/community.general/pull/2912).
-  - snap - fix various bugs which prevented the module from working at all, and which resulted in ``state=absent`` fail on absent snaps (https://github.com/ansible-collections/community.general/issues/2835, https://github.com/ansible-collections/community.general/issues/2906, https://github.com/ansible-collections/community.general/pull/2912).
diff --git a/changelogs/fragments/3.3.1.yml b/changelogs/fragments/3.3.1.yml
deleted file mode 100644
index efb2089c94..0000000000
--- a/changelogs/fragments/3.3.1.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Extraordinary bugfix release to fix a fatal bug in ``snap``.