Skip to content

Commit 50ee84f

Browse files
jonathan-buttnerjonathan-buttner
committed
Merge branch 'main' of github.com:elastic/elasticsearch into ia-fix-eis-endpoints
2 parents 89592d1 + cb81e65 commit 50ee84f

File tree

162 files changed

+541
-1240
lines changed

Some content is hidden

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

162 files changed

+541
-1240
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.8", "9.1.8", "9.2.2", "9.3.0"]
68+
BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "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
@@ -404,8 +404,8 @@ steps:
404404
- signal_reason: agent_stop
405405
limit: 3
406406

407-
- label: 9.1.8 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.8#bwcTest
407+
- label: 9.1.9 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.9#bwcTest
409409
timeout_in_minutes: 300
410410
agents:
411411
provider: gcp
@@ -414,7 +414,7 @@ steps:
414414
buildDirectory: /dev/shm/bk
415415
preemptible: true
416416
env:
417-
BWC_VERSION: 9.1.8
417+
BWC_VERSION: 9.1.9
418418
retry:
419419
automatic:
420420
- exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
538538
timeout_in_minutes: 300
539539
matrix:
540540
setup:
541-
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
541+
BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "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
@@ -368,8 +368,8 @@ steps:
368368
env:
369369
BWC_VERSION: 9.0.8
370370

371-
- label: "{{matrix.image}} / 9.1.8 / packaging-tests-upgrade"
372-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.8
371+
- label: "{{matrix.image}} / 9.1.9 / packaging-tests-upgrade"
372+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.9
373373
timeout_in_minutes: 300
374374
matrix:
375375
setup:
@@ -382,7 +382,7 @@ steps:
382382
machineType: custom-16-32768
383383
buildDirectory: /dev/shm/bk
384384
env:
385-
BWC_VERSION: 9.1.8
385+
BWC_VERSION: 9.1.9
386386

387387
- label: "{{matrix.image}} / 9.2.2 / packaging-tests-upgrade"
388388
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.2

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ steps:
401401
- signal_reason: agent_stop
402402
limit: 3
403403

404-
- label: 9.1.8 / bwc
405-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.8#bwcTest
404+
- label: 9.1.9 / bwc
405+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.9#bwcTest
406406
timeout_in_minutes: 300
407407
agents:
408408
provider: gcp
@@ -411,7 +411,7 @@ steps:
411411
buildDirectory: /dev/shm/bk
412412
preemptible: true
413413
env:
414-
BWC_VERSION: 9.1.8
414+
BWC_VERSION: 9.1.9
415415
retry:
416416
automatic:
417417
- exit_status: "-1"
@@ -530,7 +530,7 @@ steps:
530530
setup:
531531
ES_RUNTIME_JAVA:
532532
- openjdk21
533-
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
533+
BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
534534
agents:
535535
provider: gcp
536536
image: family/elasticsearch-ubuntu-2404
@@ -575,7 +575,7 @@ steps:
575575
ES_RUNTIME_JAVA:
576576
- openjdk21
577577
- openjdk25
578-
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2", "9.3.0"]
578+
BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
579579
agents:
580580
provider: gcp
581581
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ BWC_VERSION:
2020
- "8.18.8"
2121
- "8.19.8"
2222
- "9.0.8"
23-
- "9.1.8"
23+
- "9.1.9"
2424
- "9.2.2"
2525
- "9.3.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
22
- "8.19.8"
3-
- "9.1.8"
3+
- "9.1.9"
44
- "9.2.2"
55
- "9.3.0"

‎branches.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
{
1313
"branch" : "9.1",
14-
"version" : "9.1.8"
14+
"version" : "9.1.9"
1515
},
1616
{
1717
"branch" : "8.19",

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ icu4j = 77.1
1212
supercsv = 2.4.0
1313
log4j = 2.19.0
1414
slf4j = 2.0.6
15-
ecsLogging = 1.2.0
15+
ecsLogging = 1.7.0
1616
jna = 5.12.1
1717
netty = 4.1.126.Final
1818
commons_lang3 = 3.9

‎docs/changelog/108875.yaml‎

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

‎docs/changelog/135873.yaml‎

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

0 commit comments

Comments
 (0)