[8.13] Fix merging component templates with a mix of dotted and nested object mapper definitions (#106077) #107254
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…t mapper definitions (elastic#106077) Co-authored-by: Andrei Dan <[email protected]> (cherry picked from commit ab52ef1)
elasticsearchmachine
added
external-contributor
this sneaked in while resolving merge conflicts
felixbarny
added
the
auto-merge-without-approval
|
I manually created this backport PR due to merge conflicts. I've verified, line by line, that the content is equal to the main PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This will backport the following commits from
mainto8.13:Questions ?
Please refer to the Backport tool documentation