From 078e75c1956501dbb253825e34d7409d2a620677 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:57:47 -0400
Subject: [PATCH] Update changelog refs/tags/2.5.1 (#684)

Co-authored-by: sean-m-sullivan <sean-m-sullivan@users.noreply.github.com>
---
 CHANGELOG.rst                                | 15 +++++++++++++++
 changelogs/.plugin-cache.yaml                |  2 +-
 changelogs/changelog.yaml                    | 17 +++++++++++++++++
 changelogs/fragments/add_request_timeout.yml |  4 ----
 changelogs/fragments/licence_org.yml         |  7 -------
 galaxy.yml                                   |  2 +-
 6 files changed, 34 insertions(+), 13 deletions(-)
 delete mode 100644 changelogs/fragments/add_request_timeout.yml
 delete mode 100644 changelogs/fragments/licence_org.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c5e4d6658..313aaac15 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,21 @@ infra.controller_configuration Release Notes
 .. contents:: Topics
 
 
+v2.5.1
+======
+
+Minor Changes
+-------------
+
+- Adds request_timeout to controller_export_diff module, and roles
+- licence role now uses a boolean of controller_license.use_looup to determine whether to lookup subscriptions. A lookup is only needed to refresh the available pools, or if it has never been done. See Role Readme for details.
+
+Bugfixes
+--------
+
+- Fixed issue with licence role not operating properly, when a controller never had credentials provided for subscription lookup. See Role Readme for proper usuage.
+- Fixed issue with organization role not acceppting default environments option correctly.
+
 v2.5.0
 ======
 
diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
index 753e86d4d..e02da8dd6 100644
--- a/changelogs/.plugin-cache.yaml
+++ b/changelogs/.plugin-cache.yaml
@@ -176,4 +176,4 @@ plugins:
   strategy: {}
   test: {}
   vars: {}
-version: 2.5.0
+version: 2.5.1
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 01d0b6710..3eb8d0be9 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -534,3 +534,20 @@ releases:
     - roles.yml
     - source_build.yml
     release_date: '2023-08-03'
+  2.5.1:
+    changes:
+      bugfixes:
+      - Fixed issue with licence role not operating properly, when a controller never
+        had credentials provided for subscription lookup. See Role Readme for proper
+        usuage.
+      - Fixed issue with organization role not acceppting default environments option
+        correctly.
+      minor_changes:
+      - Adds request_timeout to controller_export_diff module, and roles
+      - licence role now uses a boolean of controller_license.use_looup to determine
+        whether to lookup subscriptions. A lookup is only needed to refresh the available
+        pools, or if it has never been done. See Role Readme for details.
+    fragments:
+    - add_request_timeout.yml
+    - licence_org.yml
+    release_date: '2023-08-29'
diff --git a/changelogs/fragments/add_request_timeout.yml b/changelogs/fragments/add_request_timeout.yml
deleted file mode 100644
index d0fa4ff70..000000000
--- a/changelogs/fragments/add_request_timeout.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-minor_changes:
-  - Adds request_timeout to controller_export_diff module, and roles
-...
diff --git a/changelogs/fragments/licence_org.yml b/changelogs/fragments/licence_org.yml
deleted file mode 100644
index b1d3e2f6d..000000000
--- a/changelogs/fragments/licence_org.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-bugfixes:
-  - Fixed issue with organization role not acceppting default environments option correctly.
-  - Fixed issue with licence role not operating properly, when a controller never had credentials provided for subscription lookup. See Role Readme for proper usuage.
-minor_changes:
-  - licence role now uses a boolean of controller_license.use_looup to determine whether to lookup subscriptions. A lookup is only needed to refresh the available pools, or if it has never been done. See Role Readme for details.
-...
diff --git a/galaxy.yml b/galaxy.yml
index a796f8dc0..d7954ffbb 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: infra
 name: controller_configuration
-version: 2.5.0-devel
+version: 2.5.1-devel
 description: A collection of roles to manage Ansible Controller
 readme: README.md
 authors: