Skip to content

Conversation

Mikep86
Copy link
Contributor

@Mikep86 Mikep86 commented Oct 2, 2024

Backport

This will backport the following commits from main to 8.x:

Questions ?

Please refer to the Backport tool documentation

…tic#113907)

(cherry picked from commit a5d033b)

# Conflicts:
#	x-pack/plugin/ent-search/src/test/java/org/elasticsearch/xpack/application/analytics/action/PutAnalyticsCollectionResponseBWCSerializingTests.java
Copy link
Member

@kderusso kderusso left a comment

Choose a reason for hiding this comment

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

🚢

@Mikep86
Copy link
Contributor Author

Mikep86 commented Oct 2, 2024

@elasticmachine merge upstream

@Mikep86
Copy link
Contributor Author

Mikep86 commented Oct 3, 2024

@elasticmachine merge upstream

@benwtrent benwtrent added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Oct 3, 2024
@benwtrent
Copy link
Member

@elasticmachine update branch

elasticsearchmachine pushed a commit that referenced this pull request Oct 3, 2024
…thetic_source/object array in object with dynamic override} (#114044)

Mute this test failure that is blocking the ability to merge #114027 and
#113977
@Mikep86
Copy link
Contributor Author

Mikep86 commented Oct 4, 2024

@elasticmachine update branch

@elasticsearchmachine elasticsearchmachine merged commit 50da66b into elastic:8.x Oct 4, 2024
15 checks passed
@Mikep86 Mikep86 deleted the backport/8.x/pr-113907 branch October 4, 2024 13: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 v8.16.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants