From 28d7c499b587dd61e9abc7c70c593e97f67f27b5 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Mon, 13 Nov 2023 19:58:06 +0100
Subject: [PATCH] Release 8.0.2.

---
 CHANGELOG.rst                              | 14 ++++++++++++++
 changelogs/changelog.yaml                  | 14 ++++++++++++++
 changelogs/fragments/7501-type.yml         |  2 --
 changelogs/fragments/7506-pipx-pipargs.yml |  2 --
 changelogs/fragments/8.0.2.yml             |  1 -
 5 files changed, 28 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/7501-type.yml
 delete mode 100644 changelogs/fragments/7506-pipx-pipargs.yml
 delete mode 100644 changelogs/fragments/8.0.2.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bc465228b62..1e56834681e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -6,6 +6,20 @@ Community General Release Notes
 
 This changelog describes changes after version 7.0.0.
 
+v8.0.2
+======
+
+Release Summary
+---------------
+
+Bugfix release for inclusion in Ansible 9.0.0rc1.
+
+Bugfixes
+--------
+
+- ocapi_utils, oci_utils, redfish_utils module utils - replace ``type()`` calls with ``isinstance()`` calls (https://github.com/ansible-collections/community.general/pull/7501).
+- pipx module utils - change the CLI argument formatter for the ``pip_args`` parameter (https://github.com/ansible-collections/community.general/issues/7497, https://github.com/ansible-collections/community.general/pull/7506).
+
 v8.0.1
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 89113b5cd3e..4e7e2ad04e4 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -809,3 +809,17 @@ releases:
     - 7467-fix-gitlab-constants-calls.yml
     - 8.0.1.yml
     release_date: '2023-11-06'
+  8.0.2:
+    changes:
+      bugfixes:
+      - ocapi_utils, oci_utils, redfish_utils module utils - replace ``type()`` calls
+        with ``isinstance()`` calls (https://github.com/ansible-collections/community.general/pull/7501).
+      - pipx module utils - change the CLI argument formatter for the ``pip_args``
+        parameter (https://github.com/ansible-collections/community.general/issues/7497,
+        https://github.com/ansible-collections/community.general/pull/7506).
+      release_summary: Bugfix release for inclusion in Ansible 9.0.0rc1.
+    fragments:
+    - 7501-type.yml
+    - 7506-pipx-pipargs.yml
+    - 8.0.2.yml
+    release_date: '2023-11-13'
diff --git a/changelogs/fragments/7501-type.yml b/changelogs/fragments/7501-type.yml
deleted file mode 100644
index 994c31ce5aa..00000000000
--- a/changelogs/fragments/7501-type.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - "ocapi_utils, oci_utils, redfish_utils module utils - replace ``type()`` calls with ``isinstance()`` calls (https://github.com/ansible-collections/community.general/pull/7501)."
diff --git a/changelogs/fragments/7506-pipx-pipargs.yml b/changelogs/fragments/7506-pipx-pipargs.yml
deleted file mode 100644
index fb5cb52e6f7..00000000000
--- a/changelogs/fragments/7506-pipx-pipargs.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-  - pipx module utils - change the CLI argument formatter for the ``pip_args`` parameter (https://github.com/ansible-collections/community.general/issues/7497, https://github.com/ansible-collections/community.general/pull/7506).
diff --git a/changelogs/fragments/8.0.2.yml b/changelogs/fragments/8.0.2.yml
deleted file mode 100644
index 975826acf5c..00000000000
--- a/changelogs/fragments/8.0.2.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix release for inclusion in Ansible 9.0.0rc1.