Skip to content

Conversation

@jfreden
Copy link
Contributor

@jfreden jfreden commented Oct 9, 2024

Backport

This will backport the following commits from main to 8.15:

Questions ?

Please refer to the Backport tool documentation

…" and related (elastic#114326)

Revert "Fix BWC for file-settings based role mappings (elastic#113900)" and related changes. Reverted commits:

- 763764c
- bc8f9dc
- ce07060

This is due to a bug in the above fix. We will reintroduce a paired down version of the fix in a subsequent PR.

(cherry picked from commit f389623)

# Conflicts:
#	x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/RoleMappingFileSettingsIT.java
#	x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/role/TransportDeleteRoleAction.java
#	x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/TransportDeleteRoleMappingAction.java
#	x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/action/rolemapping/TransportPutRoleMappingAction.java
@jfreden jfreden added v8.15.3 and removed v8.15.4 labels Oct 9, 2024
@n1v0lg n1v0lg self-requested a review October 9, 2024 12:29
@n1v0lg n1v0lg added :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) >non-issue labels Oct 9, 2024
@n1v0lg n1v0lg added the Team:Security Meta label for security team label Oct 9, 2024
@n1v0lg n1v0lg added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) and removed auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) labels Oct 9, 2024
@n1v0lg n1v0lg added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Oct 9, 2024
@n1v0lg n1v0lg merged commit 89c6684 into elastic:8.15 Oct 9, 2024
18 of 20 checks passed
@jfreden jfreden deleted the backport/8.15/pr-114326 branch October 9, 2024 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport >non-issue :Security/Authentication Logging in, Usernames/passwords, Realms (Native/LDAP/AD/SAML/PKI/etc) Team:Security Meta label for security team v8.15.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants