Skip to content

Commit 55dcdcd

Browse files
jfredenjfreden
authored
Merge branch '9.2' into backport/9.2/pr-137558
2 parents 5959bb1 + ed771e6 commit 55dcdcd

File tree

68 files changed

+1145
-1169
lines changed

Some content is hidden

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

68 files changed

+1145
-1169
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ steps:
9292
setup:
9393
ES_RUNTIME_JAVA:
9494
- openjdk21
95-
- openjdk23
96-
- openjdk24
95+
- openjdk25
9796
GRADLE_TASK:
9897
- checkPart1
9998
- checkPart2
@@ -118,7 +117,7 @@ steps:
118117
setup:
119118
ES_RUNTIME_JAVA:
120119
- openjdk21
121-
- openjdk23
120+
- openjdk25
122121
BWC_VERSION: $BWC_LIST
123122
agents:
124123
provider: gcp

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,7 @@ steps:
530530
setup:
531531
ES_RUNTIME_JAVA:
532532
- openjdk21
533-
- openjdk23
534-
- openjdk24
533+
- openjdk25
535534
GRADLE_TASK:
536535
- checkPart1
537536
- checkPart2
@@ -556,7 +555,7 @@ steps:
556555
setup:
557556
ES_RUNTIME_JAVA:
558557
- openjdk21
559-
- openjdk23
558+
- openjdk25
560559
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2"]
561560
agents:
562561
provider: gcp

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Extract Elasticsearch artifact
2626
################################################################################
2727
28-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a02c67d96cd6ec1b50a055f1f5515e0987b643d001d436088cefc02e5b786bf9 AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:f30b871373f23e31c9b083625d9e77075e6cde801227520b10b081b749b7f8c1 AS builder
2929
3030
# Install required packages to extract the Elasticsearch distribution
3131
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -104,7 +104,7 @@ WORKDIR /usr/share/elasticsearch/config
104104
# Add entrypoint
105105
################################################################################
106106

107-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:a02c67d96cd6ec1b50a055f1f5515e0987b643d001d436088cefc02e5b786bf9
107+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:f30b871373f23e31c9b083625d9e77075e6cde801227520b10b081b749b7f8c1
108108

109109
RUN <%= retry.loop(package_manager,
110110
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# Extract Elasticsearch artifact
2626
################################################################################
2727
28-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:775e340540cbf2fbf81f406f0191824f3c691f2613d8d51da1f992eb26aec82b AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:25397820ef168d951339e69cedb5460f354cea842e2af367e33b89e988c51615 AS builder
2929
3030
# Install required packages to extract the Elasticsearch distribution
3131
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -80,7 +80,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
8080
# Add entrypoint
8181
################################################################################
8282

83-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:775e340540cbf2fbf81f406f0191824f3c691f2613d8d51da1f992eb26aec82b
83+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:25397820ef168d951339e69cedb5460f354cea842e2af367e33b89e988c51615
8484

8585
RUN <%= retry.loop(package_manager,
8686
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/changelog/137638.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 137638
2+
summary: "ILM Explain: valid JSON on truncated step info"
3+
area: ILM+SLM
4+
type: bug
5+
issues:
6+
- 135458

‎docs/changelog/138140.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138140
2+
summary: "Fix semantic highlighting when using a `knn` query with minimum `similarity` and when using `bbq_disk`"
3+
area: Relevance
4+
type: bug
5+
issues: []

‎docs/changelog/138539.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138539
2+
summary: Handle serialization of null blocks in `AggregateMetricDoubleBlock`
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/138589.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138589
2+
summary: Upgrading commons-lang3 version for repository-hdfs plugin
3+
area: Snapshot/Restore
4+
type: upgrade
5+
issues: []

‎docs/changelog/138624.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 138624
2+
summary: Handle individual doc parsing failure in bulk request with pipeline
3+
area: Ingest Node
4+
type: bug
5+
issues:
6+
- 138445

‎docs/changelog/138644.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138644
2+
summary: "Fix: add missing `vector_similarity_support` in InferenceFeatures"
3+
area: Search
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)