Skip to content

Conversation

mark-vieira
Copy link
Contributor

Backports the following commits to 9.0:

@mark-vieira mark-vieira requested a review from a team as a code owner March 26, 2025 17:07
@mark-vieira mark-vieira added :Delivery/Build Build or test infrastructure >refactoring >test Issues or PRs that are addressing/adding tests auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport Team:Delivery Meta label for Delivery team labels Mar 26, 2025
mark-vieira and others added 9 commits March 26, 2025 13:42
…duplicated ChannelSet (elastic#125636) (elastic#125720)

* make numberOfChannels consistent with layout

(cherry picked from commit 80125a4)

# Conflicts:
#	x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java
@mark-vieira mark-vieira merged commit 4d31c59 into elastic:9.0 Mar 27, 2025
16 checks passed
@mark-vieira mark-vieira deleted the backport/9.0/pr-125545 branch March 27, 2025 18:03
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 :Delivery/Build Build or test infrastructure >refactoring Team:Delivery Meta label for Delivery team >test Issues or PRs that are addressing/adding tests v9.0.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants