Skip to content

Commit 4cf5cc2

Browse files
costincostin
committed
Merge remote-tracking branch 'remotes/upstream/main' into esql/promql
2 parents bd93fac + 12df171 commit 4cf5cc2

File tree

504 files changed

+17915
-6239
lines changed

Some content is hidden

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

504 files changed

+17915
-6239
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.19.6", "9.1.7", "9.2.1", "9.3.0"]
68+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ steps:
366366
- signal_reason: agent_stop
367367
limit: 3
368368

369-
- label: 8.19.6 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.6#bwcTest
369+
- label: 8.19.7 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.7#bwcTest
371371
timeout_in_minutes: 300
372372
agents:
373373
provider: gcp
@@ -376,7 +376,7 @@ steps:
376376
buildDirectory: /dev/shm/bk
377377
preemptible: true
378378
env:
379-
BWC_VERSION: 8.19.6
379+
BWC_VERSION: 8.19.7
380380
retry:
381381
automatic:
382382
- exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
538538
timeout_in_minutes: 300
539539
matrix:
540540
setup:
541-
BWC_VERSION: ["8.19.6", "9.1.7", "9.2.1", "9.3.0"]
541+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
542542
agents:
543543
provider: gcp
544544
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ steps:
334334
env:
335335
BWC_VERSION: 8.18.8
336336

337-
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
337+
- label: "{{matrix.image}} / 8.19.7 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.7
339339
timeout_in_minutes: 300
340340
matrix:
341341
setup:
@@ -348,7 +348,7 @@ steps:
348348
machineType: custom-16-32768
349349
buildDirectory: /dev/shm/bk
350350
env:
351-
BWC_VERSION: 8.19.6
351+
BWC_VERSION: 8.19.7
352352

353353
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
354354
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.6 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.6#bwcTest
366+
- label: 8.19.7 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.7#bwcTest
368368
timeout_in_minutes: 300
369369
agents:
370370
provider: gcp
@@ -373,7 +373,7 @@ steps:
373373
buildDirectory: /dev/shm/bk
374374
preemptible: true
375375
env:
376-
BWC_VERSION: 8.19.6
376+
BWC_VERSION: 8.19.7
377377
retry:
378378
automatic:
379379
- exit_status: "-1"
@@ -525,7 +525,7 @@ steps:
525525
setup:
526526
ES_RUNTIME_JAVA:
527527
- openjdk21
528-
BWC_VERSION: ["8.19.6", "9.1.7", "9.2.1", "9.3.0"]
528+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
529529
agents:
530530
provider: gcp
531531
image: family/elasticsearch-ubuntu-2404
@@ -569,7 +569,7 @@ steps:
569569
ES_RUNTIME_JAVA:
570570
- openjdk21
571571
- openjdk23
572-
BWC_VERSION: ["8.19.6", "9.1.7", "9.2.1", "9.3.0"]
572+
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1", "9.3.0"]
573573
agents:
574574
provider: gcp
575575
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.8"
21-
- "8.19.6"
21+
- "8.19.7"
2222
- "9.0.7"
2323
- "9.1.7"
2424
- "9.2.1"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
2-
- "8.19.6"
2+
- "8.19.7"
33
- "9.1.7"
44
- "9.2.1"
55
- "9.3.0"

‎branches.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"branch" : "8.19",
18-
"version" : "8.19.6"
18+
"version" : "8.19.7"
1919
},
2020
{
2121
"branch" : "7.17",

‎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:cbdc968f357706186e2b83ea1fea92382f5d51842e867a662541b67c28f4e809 AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:7b18967a1329291d113228149b97382406f039171c6537b1afa4067701a6ba9e 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:cbdc968f357706186e2b83ea1fea92382f5d51842e867a662541b67c28f4e809
107+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:7b18967a1329291d113228149b97382406f039171c6537b1afa4067701a6ba9e
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:b85d54c9019ff80e88aab7d357ede3341d1442ce190173eed42ae5a116753e4e AS builder
28+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:46fd486e4716d592aa1ad7dad15bb3e6d0aa5b08b2070e9daec9f6b8c8c990a6 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:b85d54c9019ff80e88aab7d357ede3341d1442ce190173eed42ae5a116753e4e
83+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:46fd486e4716d592aa1ad7dad15bb3e6d0aa5b08b2070e9daec9f6b8c8c990a6
8484

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

‎docs/changelog/135744.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 135744
2+
summary: Non-Correlated Subquery in FROM command
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)