Skip to content

Commit 60f45f2

Browse files
martijnvgmartijnvg
committed
Merge remote-tracking branch 'es/main' into synthetic_source_encode_arrays
2 parents 09c6a0e + cc29af3 commit 60f45f2

File tree

226 files changed

+2055
-2691
lines changed

Some content is hidden

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

226 files changed

+2055
-2691
lines changed

‎.buildkite/scripts/dra-update-staging.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ for BRANCH in "${BRANCHES[@]}"; do
3737

3838
if [[ "$SHOULD_TRIGGER" == "true" ]]; then
3939
if [[ "$BRANCH" == "9.0" ]]; then
40-
export VERSION_QUALIFIER="beta1"
40+
export VERSION_QUALIFIER="rc1"
4141
fi
4242
echo "Triggering DRA staging workflow for $BRANCH"
4343
cat << EOF | buildkite-agent pipeline upload

‎.buildkite/scripts/dra-workflow.trigger.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source .buildkite/scripts/branches.sh
88

99
for BRANCH in "${BRANCHES[@]}"; do
1010
if [[ "$BRANCH" == "9.0" ]]; then
11-
export VERSION_QUALIFIER="beta1"
11+
export VERSION_QUALIFIER="rc1"
1212
fi
1313

1414
INTAKE_PIPELINE_SLUG="elasticsearch-intake"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum DockerBase {
2222
// Chainguard based wolfi image with latest jdk
2323
// This is usually updated via renovatebot
2424
// spotless:off
25-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:ecd940be9f342ee6173397c48f3df5bb410e95000f8726fd01759b6c39b0beda",
25+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:d74b1fda6b7fee2c90b410df258e005c049e0672fe16d79d00e58f14fb69f90b",
2626
"-wolfi",
2727
"apk"
2828
),

‎docs/changelog/120952.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120952
2+
summary: Add `_metric_names_hash` field to OTel metric mappings
3+
area: Data streams
4+
type: bug
5+
issues: []

‎docs/changelog/122409.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 122409
2+
summary: Allow setting the `type` in the reroute processor
3+
area: Ingest Node
4+
type: enhancement
5+
issues:
6+
- 121553

‎docs/changelog/122538.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122538
2+
summary: Fix `ArrayIndexOutOfBoundsException` in `ShardBulkInferenceActionFilter`
3+
area: Ingest
4+
type: bug
5+
issues: []

‎docs/changelog/122637.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 122637
2+
summary: Use `FallbackSyntheticSourceBlockLoader` for `unsigned_long` and `scaled_float`
3+
fields
4+
area: Mapping
5+
type: enhancement
6+
issues: []

‎docs/changelog/122731.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122731
2+
summary: Fork post-snapshot-delete cleanup off master thread
3+
area: Snapshot/Restore
4+
type: bug
5+
issues: []

‎docs/changelog/122737.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122737
2+
summary: Bump json-smart and oauth2-oidc-sdk
3+
area: Authentication
4+
type: upgrade
5+
issues: []

‎docs/changelog/122857.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122857
2+
summary: Run `TransportGetWatcherSettingsAction` on local node
3+
area: Watcher
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)