Skip to content

Fix main compilation errors#145989

Closed
joshua-adams-1 wants to merge 3 commits intoelastic:mainfrom
joshua-adams-1:fix-merge-main
Closed

Fix main compilation errors#145989
joshua-adams-1 wants to merge 3 commits intoelastic:mainfrom
joshua-adams-1:fix-merge-main

Conversation

@joshua-adams-1
Copy link
Copy Markdown
Contributor

I merged #145803 but it conflicted with #145488 merged yesterday

I merged elastic#145803 but it conflicted with elastic#145488 merged yesterday
@joshua-adams-1 joshua-adams-1 self-assigned this Apr 9, 2026
@joshua-adams-1 joshua-adams-1 added >non-issue :Distributed/Reindex Issues relating to reindex that are not caused by issues further down labels Apr 9, 2026
@joshua-adams-1 joshua-adams-1 changed the title Fix merge compilation errors Fix main compilation errors Apr 9, 2026
@joshua-adams-1 joshua-adams-1 marked this pull request as ready for review April 9, 2026 14:10
@elasticsearchmachine elasticsearchmachine added the Team:Distributed Meta label for distributed team. label Apr 9, 2026
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-distributed (Team:Distributed)

@joshua-adams-1 joshua-adams-1 added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Apr 9, 2026
@joshua-adams-1
Copy link
Copy Markdown
Contributor Author

Since CI is obstinately refusing to pass, I have a simple revert commit #146011

@joshua-adams-1
Copy link
Copy Markdown
Contributor Author

Closing in favour of #146014

@joshua-adams-1 joshua-adams-1 deleted the fix-merge-main branch April 10, 2026 08:11
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!) :Distributed/Reindex Issues relating to reindex that are not caused by issues further down >non-issue Team:Distributed Meta label for distributed team. v9.5.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants