Skip to content

Commit 0beed2b

Browse files
mayya-sharipovamayya-sharipova
committed
Merge remote-tracking branch 'upstream/lucene_snapshot' into intervals_increase_max_expansions
2 parents 88ef8da + 9fe36d2 commit 0beed2b

File tree

11,041 files changed

+84233
-52708
lines changed

Some content is hidden

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

11,041 files changed

+84233
-52708
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ steps:
6262
timeout_in_minutes: 300
6363
matrix:
6464
setup:
65-
BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
65+
BWC_VERSION: ["7.17.25", "8.15.2", "8.16.0"]
6666
agents:
6767
provider: gcp
6868
image: family/elasticsearch-ubuntu-2004

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ steps:
322322
env:
323323
BWC_VERSION: 7.16.3
324324

325-
- label: "{{matrix.image}} / 7.17.24 / packaging-tests-upgrade"
326-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.24
325+
- label: "{{matrix.image}} / 7.17.25 / packaging-tests-upgrade"
326+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.17.25
327327
timeout_in_minutes: 300
328328
matrix:
329329
setup:
@@ -337,7 +337,7 @@ steps:
337337
buildDirectory: /dev/shm/bk
338338
diskSizeGb: 250
339339
env:
340-
BWC_VERSION: 7.17.24
340+
BWC_VERSION: 7.17.25
341341

342342
- label: "{{matrix.image}} / 8.0.1 / packaging-tests-upgrade"
343343
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.0.1
@@ -594,8 +594,8 @@ steps:
594594
env:
595595
BWC_VERSION: 8.14.3
596596

597-
- label: "{{matrix.image}} / 8.15.1 / packaging-tests-upgrade"
598-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.1
597+
- label: "{{matrix.image}} / 8.15.2 / packaging-tests-upgrade"
598+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.2
599599
timeout_in_minutes: 300
600600
matrix:
601601
setup:
@@ -609,7 +609,7 @@ steps:
609609
buildDirectory: /dev/shm/bk
610610
diskSizeGb: 250
611611
env:
612-
BWC_VERSION: 8.15.1
612+
BWC_VERSION: 8.15.2
613613

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

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ steps:
342342
- signal_reason: agent_stop
343343
limit: 3
344344

345-
- label: 7.17.24 / bwc
346-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.24#bwcTest
345+
- label: 7.17.25 / bwc
346+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.17.25#bwcTest
347347
timeout_in_minutes: 300
348348
agents:
349349
provider: gcp
@@ -353,7 +353,7 @@ steps:
353353
preemptible: true
354354
diskSizeGb: 250
355355
env:
356-
BWC_VERSION: 7.17.24
356+
BWC_VERSION: 7.17.25
357357
retry:
358358
automatic:
359359
- exit_status: "-1"
@@ -662,8 +662,8 @@ steps:
662662
- signal_reason: agent_stop
663663
limit: 3
664664

665-
- label: 8.15.1 / bwc
666-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.1#bwcTest
665+
- label: 8.15.2 / bwc
666+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.2#bwcTest
667667
timeout_in_minutes: 300
668668
agents:
669669
provider: gcp
@@ -673,7 +673,7 @@ steps:
673673
preemptible: true
674674
diskSizeGb: 250
675675
env:
676-
BWC_VERSION: 8.15.1
676+
BWC_VERSION: 8.15.2
677677
retry:
678678
automatic:
679679
- exit_status: "-1"
@@ -771,7 +771,7 @@ steps:
771771
setup:
772772
ES_RUNTIME_JAVA:
773773
- openjdk17
774-
BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
774+
BWC_VERSION: ["7.17.25", "8.15.2", "8.16.0"]
775775
agents:
776776
provider: gcp
777777
image: family/elasticsearch-ubuntu-2004
@@ -821,7 +821,7 @@ steps:
821821
- openjdk21
822822
- openjdk22
823823
- openjdk23
824-
BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
824+
BWC_VERSION: ["7.17.25", "8.15.2", "8.16.0"]
825825
agents:
826826
provider: gcp
827827
image: family/elasticsearch-ubuntu-2004

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BWC_VERSION:
1616
- "7.14.2"
1717
- "7.15.2"
1818
- "7.16.3"
19-
- "7.17.24"
19+
- "7.17.25"
2020
- "8.0.1"
2121
- "8.1.3"
2222
- "8.2.3"
@@ -32,5 +32,5 @@ BWC_VERSION:
3232
- "8.12.2"
3333
- "8.13.4"
3434
- "8.14.3"
35-
- "8.15.1"
35+
- "8.15.2"
3636
- "8.16.0"

‎.ci/scripts/resolve-dra-manifest.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@ LATEST_VERSION=$(strip_version $LATEST_BUILD)
2323
if [ "$LATEST_VERSION" != "$ES_VERSION" ]; then
2424
echo "Latest build for '$ARTIFACT' is version $LATEST_VERSION but expected version $ES_VERSION." 1>&2
2525
NEW_BRANCH=$(echo $ES_VERSION | sed -E "s/([0-9]+\.[0-9]+)\.[0-9]/\1/g")
26+
27+
# Temporary
28+
if [[ "$ES_VERSION" == "8.16.0" ]]; then
29+
NEW_BRANCH="8.x"
30+
fi
31+
2632
echo "Using branch $NEW_BRANCH instead of $BRANCH." 1>&2
2733
LATEST_BUILD=$(fetch_build $WORKFLOW $ARTIFACT $NEW_BRANCH)
2834
fi

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
BWC_VERSION:
2-
- "7.17.24"
3-
- "8.15.1"
2+
- "7.17.25"
3+
- "8.15.2"
44
- "8.16.0"

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,7 @@ server/src/main/java/org/elasticsearch/threadpool @elastic/es-core-infra
7070
# Security
7171
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/privilege @elastic/es-security
7272
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStore.java @elastic/es-security
73+
74+
# Analytical engine
75+
x-pack/plugin/esql @elastic/es-analytical-engine
76+
x-pack/plugin/esql-core @elastic/es-analytical-engine

‎CONTRIBUTING.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,11 @@ license header unless instructed otherwise:
378378

379379
/*
380380
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
381-
* or more contributor license agreements. Licensed under the Elastic License
382-
* 2.0 and the Server Side Public License, v 1; you may not use this file except
383-
* in compliance with, at your election, the Elastic License 2.0 or the Server
384-
* Side Public License, v 1.
381+
* or more contributor license agreements. Licensed under the "Elastic License
382+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
383+
* Public License v 1"; you may not use this file except in compliance with, at
384+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
385+
* License v3.0 only", or the "Server Side Public License, v 1".
385386
*/
386387

387388
The top-level `x-pack` directory contains code covered by the [Elastic

‎LICENSE.txt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
Source code in this repository is covered by (i) a dual license under the Server
2-
Side Public License, v 1 and the Elastic License 2.0 or (ii) an Apache License
3-
2.0 compatible license or (iii) solely under the Elastic License 2.0, in each
4-
case, as noted in the applicable header. The default throughout the repository
5-
is a dual license under the Server Side Public License, v 1 and the Elastic
6-
License 2.0, unless the header specifies another license. Code that is licensed
7-
solely under the Elastic License 2.0 is found only in the x-pack folder.
1+
Source code in this repository is covered by (i) a triple license under the "GNU
2+
Affero General Public License v3.0 only", "the Server Side Public License, v 1",
3+
and the "Elastic License 2.0", or (ii) an "Apache License 2.0" compatible
4+
license or (iii) solely under the "Elastic License 2.0", in each case, as noted
5+
in the applicable header. The default throughout the repository is a triple
6+
license under the "GNU Affero General Public License v3.0 only", "the Server
7+
Side Public License, v 1", and the "Elastic License 2.0", unless the header
8+
specifies another license. Code that is licensed solely under the "Elastic
9+
License 2.0" is found only in the x-pack folder.

‎Vagrantfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
# vagrant section in TESTING.asciidoc.
66

77
# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
8-
# or more contributor license agreements. Licensed under the Elastic License
9-
# 2.0 and the Server Side Public License, v 1; you may not use this file except
10-
# in compliance with, at your election, the Elastic License 2.0 or the Server
11-
# Side Public License, v 1.
8+
# or more contributor license agreements. Licensed under the "Elastic License
9+
# 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
10+
# Public License v 1"; you may not use this file except in compliance with, at
11+
# your election, the "Elastic License 2.0", the "GNU Affero General Public
12+
# License v3.0 only", or the "Server Side Public License, v 1".
1213

1314
define_opts = {
1415
autostart: false

0 commit comments

Comments
 (0)