Skip to content

[9.2] [Fleet] Fix delete by query conflict (#241001)#241128

Merged
nchaulet merged 1 commit intoelastic:9.2from
nchaulet:backport/9.2/pr-241001
Oct 29, 2025
Merged

[9.2] [Fleet] Fix delete by query conflict (#241001)#241128
nchaulet merged 1 commit intoelastic:9.2from
nchaulet:backport/9.2/pr-241001

Conversation

@nchaulet
Copy link
Member

@nchaulet nchaulet commented Oct 29, 2025

Backport

This will backport the following commits from main to 9.2:

Questions ?

Please refer to the Backport tool documentation

@nchaulet
[Fleet] Fix delete by query conflict (elastic#241001)
3701efc 
(cherry picked from commit 1109b60)

# Conflicts:
#	x-pack/platform/test/fleet_api_integration/apis/space_awareness/helpers.ts
@nchaulet nchaulet added the backport This PR is a backport of another PR label Oct 29, 2025
@nchaulet nchaulet enabled auto-merge (squash) October 29, 2025 12:50
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Oct 29, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 29, 2025

Pinging @elastic/fleet (Team:Fleet)

@nchaulet nchaulet mentioned this pull request Oct 29, 2025
Merged
criamico
criamico reviewed Oct 29, 2025
View reviewed changes
Copy link
Contributor

@criamico criamico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nchaulet nchaulet requested a review from criamico October 29, 2025 13:56
@nchaulet
Copy link
Member Author

nchaulet commented Oct 29, 2025

@criamico looks you made a PR comment

criamico
criamico reviewed Oct 29, 2025
View reviewed changes
Copy link
Contributor

@criamico criamico left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

criamico
criamico approved these changes Oct 29, 2025
View reviewed changes
Copy link
Contributor

@criamico criamico left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nchaulet nchaulet merged commit 3ca4775 into elastic:9.2 Oct 29, 2025
18 checks passed
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 29, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Scout: [ platform / maps ] plugin / serverless-oblt - Maps - Full screen mode
  • [job] [logs] Scout: [ platform / maps ] plugin / serverless-security - Maps - Full screen mode

Metrics [docs]

✅ unchanged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@criamico criamico criamico approved these changes

@jillguyonnet jillguyonnet jillguyonnet approved these changes

@kibanamachine kibanamachine Awaiting requested review from kibanamachine kibanamachine is a code owner

Assignees

No one assigned

Labels

backport This PR is a backport of another PR Team:Fleet Team label for Observability Data Collection Fleet team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nchaulet @elasticmachine @criamico @jillguyonnet