Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix lost optimization from merge conflict in building metadata from diff #88497

Merged

Conversation

original-brownbear
Copy link
Member

The flag value was lost due to a merge mistake, bringing it back.

broken in #88250

The flag value was lost due to a merge mistake, bringing it back.
@original-brownbear original-brownbear added >non-issue :Data Management/Indices APIs APIs to create and manage indices and templates v8.4.0 labels Jul 13, 2022
@original-brownbear original-brownbear marked this pull request as ready for review July 13, 2022 09:57
@elasticmachine elasticmachine added the Team:Data Management Meta label for data/management team label Jul 13, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-data-management (Team:Data Management)

@original-brownbear
Copy link
Member Author

merging without review since this was an obvious merge error

@original-brownbear original-brownbear merged commit 5f04ad5 into elastic:master Jul 13, 2022
@original-brownbear original-brownbear deleted the fix-name-collision-skip branch July 13, 2022 11:03
@original-brownbear original-brownbear restored the fix-name-collision-skip branch April 18, 2023 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Data Management/Indices APIs APIs to create and manage indices and templates >non-issue Team:Data Management Meta label for data/management team v8.4.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants