Skip to content

Commit ef54991

Browse files
pawankartik-elasticpawankartik-elastic
authored
Merge branch 'main' into pkar/msearch-mrt-fix
2 parents e06b828 + 404d61c commit ef54991

File tree

475 files changed

+13050
-8993
lines changed

Some content is hidden

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

475 files changed

+13050
-8993
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
@@ -549,8 +549,7 @@ steps:
549549
setup:
550550
ES_RUNTIME_JAVA:
551551
- openjdk21
552-
- openjdk23
553-
- openjdk24
552+
- openjdk25
554553
GRADLE_TASK:
555554
- checkPart1
556555
- checkPart2
@@ -575,7 +574,7 @@ steps:
575574
setup:
576575
ES_RUNTIME_JAVA:
577576
- openjdk21
578-
- openjdk23
577+
- openjdk25
579578
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
580579
agents:
581580
provider: gcp

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ We add the `help wanted` label to existing GitHub issues for which community
4949
contributions are particularly welcome, and we use the `good first issue` label
5050
to mark issues that we think will be suitable for new contributors.
5151

52+
We generally do not assign issues to contributors outside of Elastic, but
53+
please check the discussion on the issue to see if anyone else is working on
54+
the same topic. If there are other active contributors in the same area then it
55+
is a good idea to reach out to them so you can work together on the issue. If
56+
there hasn't been any discussion for a while then go ahead and start working on
57+
the issue yourself.
58+
5259
The process for contributing to any of the [Elastic repositories](https://github.com/elastic/) is similar. Details for individual projects can be found below.
5360

5461
### Fork and clone the repository

‎benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void setup() {
102102
mapping.put("field" + i, new EsField("field-" + i, TEXT, emptyMap(), true, EsField.TimeSeriesFieldType.NONE));
103103
}
104104

105-
var esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Set.of());
105+
var esIndex = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD), Map.of(), Map.of(), Set.of());
106106

107107
var functionRegistry = new EsqlFunctionRegistry();
108108

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ bundled_jdk_vendor = openjdk
55
bundled_jdk = 25.0.1+8@2fbf10d8c78e40bd87641c434705079d
66
# optional dependencies
77
spatial4j = 0.7
8-
jts = 1.15.0
8+
jts = 1.20.0
99
jackson = 2.15.0
1010
snakeyaml = 2.0
1111
icu4j = 77.1

‎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" +

‎docs/changelog/108875.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 108875
2+
summary: Break on `FieldData` when building global ordinals
3+
area: Aggregations
4+
type: bug
5+
issues:
6+
- 97075

‎docs/changelog/137367.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 137367
2+
summary: GROUP BY ALL
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/137558.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 137558
2+
summary: Improve security migration resilience by handling version conflicts
3+
area: Security
4+
type: enhancement
5+
issues: []

‎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

0 commit comments

Comments
 (0)