Skip to content

Commit e0dbfe9

Browse files
charlotte-hoblikcharlotte-hoblik
authored
Merge branch '9.1' into charlotte-connectorsRN-9.1.5
2 parents c582679 + 2786b86 commit e0dbfe9

File tree

134 files changed

+442
-555
lines changed

Some content is hidden

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

134 files changed

+442
-555
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.1.5$" : "main",
6+
"^v9.1.6$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.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.18.8", "8.19.5", "9.0.8", "9.1.5"]
68+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3", "9.1.4"]
13+
FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3", "9.1.4", "9.1.5"]
1414
env:
1515
FWC_VERSION: "{{matrix.FWC_VERSION}}"

‎.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.5 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.5#bwcTest
407+
- label: 9.1.6 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.6#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.5
417+
BWC_VERSION: 9.1.6
418418
retry:
419419
automatic:
420420
- exit_status: "-1"
@@ -477,7 +477,7 @@ steps:
477477
timeout_in_minutes: 300
478478
matrix:
479479
setup:
480-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
480+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6"]
481481
agents:
482482
provider: gcp
483483
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ steps:
366366
env:
367367
BWC_VERSION: 9.0.8
368368

369-
- label: "{{matrix.image}} / 9.1.5 / packaging-tests-upgrade"
370-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.5
369+
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
370+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6
371371
timeout_in_minutes: 300
372372
matrix:
373373
setup:
@@ -380,7 +380,7 @@ steps:
380380
machineType: custom-16-32768
381381
buildDirectory: /dev/shm/bk
382382
env:
383-
BWC_VERSION: 9.1.5
383+
BWC_VERSION: 9.1.6
384384

385385
- group: packaging-tests-windows
386386
steps:

‎.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.5 / bwc
405-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.5#bwcTest
404+
- label: 9.1.6 / bwc
405+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.6#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.5
414+
BWC_VERSION: 9.1.6
415415
retry:
416416
automatic:
417417
- exit_status: "-1"
@@ -487,7 +487,7 @@ steps:
487487
setup:
488488
ES_RUNTIME_JAVA:
489489
- openjdk21
490-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
490+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6"]
491491
agents:
492492
provider: gcp
493493
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +531,7 @@ steps:
531531
ES_RUNTIME_JAVA:
532532
- openjdk21
533533
- openjdk23
534-
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.5"]
534+
BWC_VERSION: ["8.18.8", "8.19.5", "9.0.8", "9.1.6"]
535535
agents:
536536
provider: gcp
537537
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ BWC_VERSION:
2020
- "8.18.8"
2121
- "8.19.5"
2222
- "9.0.8"
23-
- "9.1.5"
23+
- "9.1.6"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ BWC_VERSION:
22
- "8.18.8"
33
- "8.19.5"
44
- "9.0.8"
5-
- "9.1.5"
5+
- "9.1.6"

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 9.1.5
1+
elasticsearch = 9.1.6
22
lucene = 10.2.2
33

44
bundled_jdk_vendor = openjdk

‎docs/changelog/134461.yaml‎

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

0 commit comments

Comments
 (0)