Skip to content

Commit e67e62d

Browse files
authored
Merge branch 'main' into inference-index-fix
2 parents c81dfd3 + 73ca4f5 commit e67e62d

File tree

80 files changed

+487
-420
lines changed

Some content is hidden

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

80 files changed

+487
-420
lines changed

.buildkite/pipelines/intake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.15.3", "8.16.0", "8.17.0", "9.0.0"]
59+
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ steps:
272272
env:
273273
BWC_VERSION: 8.14.3
274274

275-
- label: "{{matrix.image}} / 8.15.3 / packaging-tests-upgrade"
276-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.3
275+
- label: "{{matrix.image}} / 8.15.4 / packaging-tests-upgrade"
276+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.4
277277
timeout_in_minutes: 300
278278
matrix:
279279
setup:
@@ -286,7 +286,7 @@ steps:
286286
machineType: custom-16-32768
287287
buildDirectory: /dev/shm/bk
288288
env:
289-
BWC_VERSION: 8.15.3
289+
BWC_VERSION: 8.15.4
290290

291291
- label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
292292
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0

.buildkite/pipelines/periodic.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ steps:
287287
- signal_reason: agent_stop
288288
limit: 3
289289

290-
- label: 8.15.3 / bwc
291-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.3#bwcTest
290+
- label: 8.15.4 / bwc
291+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.4#bwcTest
292292
timeout_in_minutes: 300
293293
agents:
294294
provider: gcp
@@ -297,7 +297,7 @@ steps:
297297
buildDirectory: /dev/shm/bk
298298
preemptible: true
299299
env:
300-
BWC_VERSION: 8.15.3
300+
BWC_VERSION: 8.15.4
301301
retry:
302302
automatic:
303303
- exit_status: "-1"
@@ -429,7 +429,7 @@ steps:
429429
setup:
430430
ES_RUNTIME_JAVA:
431431
- openjdk21
432-
BWC_VERSION: ["8.15.3", "8.16.0", "8.17.0", "9.0.0"]
432+
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
433433
agents:
434434
provider: gcp
435435
image: family/elasticsearch-ubuntu-2004
@@ -471,7 +471,7 @@ steps:
471471
ES_RUNTIME_JAVA:
472472
- openjdk21
473473
- openjdk23
474-
BWC_VERSION: ["8.15.3", "8.16.0", "8.17.0", "9.0.0"]
474+
BWC_VERSION: ["8.15.4", "8.16.0", "8.17.0", "9.0.0"]
475475
agents:
476476
provider: gcp
477477
image: family/elasticsearch-ubuntu-2004

.ci/bwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BWC_VERSION:
1414
- "8.12.2"
1515
- "8.13.4"
1616
- "8.14.3"
17-
- "8.15.3"
17+
- "8.15.4"
1818
- "8.16.0"
1919
- "8.17.0"
2020
- "9.0.0"

.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.15.3"
2+
- "8.15.4"
33
- "8.16.0"
44
- "8.17.0"
55
- "9.0.0"

docs/changelog/111684.yaml

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

docs/changelog/112761.yaml

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

docs/changelog/112881.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112881
2+
summary: "ESQL: Remove parent from `FieldAttribute`"
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/113123.yaml

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

docs/changelog/113129.yaml

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

0 commit comments

Comments
 (0)