Skip to content

Commit 6afef65

Browse files
prwhelanprwhelan
authored
Merge branch 'main' into inference/openai-error-2
2 parents 8bdd23e + 061920b commit 6afef65

File tree

354 files changed

+8026
-4755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+8026
-4755
lines changed

‎.buildkite/pipelines/intake.template.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ steps:
9696
- trigger: elasticsearch-dra-workflow
9797
label: Trigger DRA snapshot workflow
9898
async: true
99-
branches: "main 8.* 7.17"
99+
branches: "main 9.* 8.* 7.17"
100100
build:
101101
branch: "$BUILDKITE_BRANCH"
102102
commit: "$BUILDKITE_COMMIT"

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ steps:
9797
- trigger: elasticsearch-dra-workflow
9898
label: Trigger DRA snapshot workflow
9999
async: true
100-
branches: "main 8.* 7.17"
100+
branches: "main 9.* 8.* 7.17"
101101
build:
102102
branch: "$BUILDKITE_BRANCH"
103103
commit: "$BUILDKITE_COMMIT"

‎.buildkite/pipelines/periodic.template.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ steps:
8686
ES_RUNTIME_JAVA:
8787
- openjdk21
8888
- openjdk23
89+
- openjdk24
8990
GRADLE_TASK:
9091
- checkPart1
9192
- checkPart2

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ steps:
505505
ES_RUNTIME_JAVA:
506506
- openjdk21
507507
- openjdk23
508+
- openjdk24
508509
GRADLE_TASK:
509510
- checkPart1
510511
- checkPart2

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/MrjarPlugin.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ private void addJar(Project project, SourceSet sourceSet, int javaVersion) {
163163
project.getConfigurations().register("java" + javaVersion);
164164
TaskProvider<Jar> jarTask = project.getTasks().register("java" + javaVersion + "Jar", Jar.class, task -> {
165165
task.from(sourceSet.getOutput());
166+
task.getArchiveClassifier().set("java" + javaVersion);
166167
});
167168
project.getArtifacts().add("java" + javaVersion, jarTask);
168169
}

‎docs/changelog/120751.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120751
2+
summary: Adding support for binary embedding type to Cohere service embedding type
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/120807.yaml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎docs/changelog/120852.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120852
2+
summary: Correct line and column numbers of missing named parameters
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/120957.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120957
2+
summary: Introduce `AllocationBalancingRoundSummaryService`
3+
area: Allocation
4+
type: enhancement
5+
issues: []

‎docs/changelog/121240.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121240
2+
summary: Implement runtime skip_unavailable=true
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)