From aa035e05a9671a39afbdbe483583a46f6127a4ae Mon Sep 17 00:00:00 2001
From: Matt Davis <6775756+nitzmahone@users.noreply.github.com>
Date: Tue, 16 Apr 2024 10:46:51 -0700
Subject: [PATCH] Revert "New release v2.14.16 (#83043)" (#83056)

Should've been an rc1- reverting to use normal release process.

This reverts commit e2c6e6511b1172f4b0d09132c8c53a176bb77394.
---
 changelogs/CHANGELOG-v2.14.rst            | 16 ----------------
 changelogs/changelog.yaml                 | 18 ------------------
 changelogs/fragments/2.14.16_summary.yaml |  3 ---
 lib/ansible/release.py                    |  2 +-
 4 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 changelogs/fragments/2.14.16_summary.yaml

diff --git a/changelogs/CHANGELOG-v2.14.rst b/changelogs/CHANGELOG-v2.14.rst
index 1c392ad4f7d..32c205f5aa7 100644
--- a/changelogs/CHANGELOG-v2.14.rst
+++ b/changelogs/CHANGELOG-v2.14.rst
@@ -5,22 +5,6 @@ ansible-core 2.14 "C'mon Everybody" Release Notes
 .. contents:: Topics
 
 
-v2.14.16
-========
-
-Release Summary
----------------
-
-| Release Date: 2024-04-15
-| `Porting Guide <https://docs.ansible.com/ansible-core/2.14/porting_guides/porting_guide_core_2.14.html>`__
-
-
-Bugfixes
---------
-
-- ansible-test ansible-doc sanity test - do not remove underscores from plugin names in collections before calling ``ansible-doc`` (https://github.com/ansible/ansible/pull/82574).
-- winrm - Do not raise another exception during cleanup when a task is timed out - https://github.com/ansible/ansible/issues/81095
-
 v2.14.15
 ========
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 06c93b35ed0..affd3090bec 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1073,24 +1073,6 @@ releases:
     - 82708-unsafe-plugin-name-error.yml
     - ansible-test-pytest-8.yml
     release_date: '2024-03-18'
-  2.14.16:
-    changes:
-      bugfixes:
-      - ansible-test ansible-doc sanity test - do not remove underscores from plugin
-        names in collections before calling ``ansible-doc`` (https://github.com/ansible/ansible/pull/82574).
-      - winrm - Do not raise another exception during cleanup when a task is timed
-        out - https://github.com/ansible/ansible/issues/81095
-      release_summary: '| Release Date: 2024-04-15
-
-        | `Porting Guide <https://docs.ansible.com/ansible-core/2.14/porting_guides/porting_guide_core_2.14.html>`__
-
-        '
-    codename: C'mon Everybody
-    fragments:
-    - 2.14.16_summary.yaml
-    - 82574-ansible-test-ansible-doc-underscore.yml
-    - winrm-task-timeout.yml
-    release_date: '2024-04-15'
   2.14.1rc1:
     changes:
       bugfixes:
diff --git a/changelogs/fragments/2.14.16_summary.yaml b/changelogs/fragments/2.14.16_summary.yaml
deleted file mode 100644
index 58f19cb6410..00000000000
--- a/changelogs/fragments/2.14.16_summary.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-release_summary: |
-   | Release Date: 2024-04-15
-   | `Porting Guide <https://docs.ansible.com/ansible-core/2.14/porting_guides/porting_guide_core_2.14.html>`__
diff --git a/lib/ansible/release.py b/lib/ansible/release.py
index 6f4594519d0..fe630c04957 100644
--- a/lib/ansible/release.py
+++ b/lib/ansible/release.py
@@ -19,6 +19,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__version__ = '2.14.16'
+__version__ = '2.14.15.post0'
 __author__ = 'Ansible, Inc.'
 __codename__ = "C'mon Everybody"