From ccc974e2fa3a9bea77a740a4f98a151c48c80d2d Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 13 Mar 2026 07:42:00 +0100 Subject: [PATCH] Consolidate changelog fragments (#11576) Consolidate changelog fragments. --- changelogs/fragments/11561-use-httpstatus-1.yml | 12 ++++++------ changelogs/fragments/11573-httpstatus-fix.yml | 7 ------- 2 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 changelogs/fragments/11573-httpstatus-fix.yml diff --git a/changelogs/fragments/11561-use-httpstatus-1.yml b/changelogs/fragments/11561-use-httpstatus-1.yml index 227514e190..0b7a686dd9 100644 --- a/changelogs/fragments/11561-use-httpstatus-1.yml +++ b/changelogs/fragments/11561-use-httpstatus-1.yml @@ -1,9 +1,9 @@ minor_changes: - - icinga2 inventory plugin - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). + - icinga2 inventory plugin - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561, https://github.com/ansible-collections/community.general/pull/11573). - github_app_access_token lookup plugin - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - - consul module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). + - consul module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561, https://github.com/ansible-collections/community.general/pull/11573). - gandi_livedns_api module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - - hwc_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). + - hwc_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561, https://github.com/ansible-collections/community.general/pull/11573). - keycloak module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - ipa module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - memset module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). @@ -11,8 +11,8 @@ minor_changes: - ocapi_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - online module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - oci_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - - redfish_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - - rundeck module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). + - redfish_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561, https://github.com/ansible-collections/community.general/pull/11573). + - rundeck module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561, https://github.com/ansible-collections/community.general/pull/11573). - scaleway module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - bitbucket module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). - - utm_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561). + - utm_utils module utils - use Python-defined constants for HTTP return codes (https://github.com/ansible-collections/community.general/pull/11561, https://github.com/ansible-collections/community.general/pull/11573). diff --git a/changelogs/fragments/11573-httpstatus-fix.yml b/changelogs/fragments/11573-httpstatus-fix.yml deleted file mode 100644 index 63a6b90e2c..0000000000 --- a/changelogs/fragments/11573-httpstatus-fix.yml +++ /dev/null @@ -1,7 +0,0 @@ -bugfixes: - - icinga2 inventory plugin - remove Python 3.11 constructs added by mistake (https://github.com/ansible-collections/community.general/pull/11573). - - consul module utils - remove Python 3.11 constructs added by mistake (https://github.com/ansible-collections/community.general/pull/11573). - - hwc_utils module utils - remove Python 3.11 constructs added by mistake (https://github.com/ansible-collections/community.general/pull/11573). - - redfish_utils module utils - remove Python 3.11 constructs added by mistake (https://github.com/ansible-collections/community.general/pull/11573). - - rundeck module utils - remove Python 3.11 constructs added by mistake (https://github.com/ansible-collections/community.general/pull/11573). - - utm_utils module utils - remove Python 3.11 constructs added by mistake (https://github.com/ansible-collections/community.general/pull/11573).