Skip to content

Commit a368781

Browse files
committed
Merge remote-tracking branch 'origin/main' into remove-snapshot-failures
2 parents 0761fc4 + d8a3fc2 commit a368781

File tree

197 files changed

+3460
-2361
lines changed

Some content is hidden

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

197 files changed

+3460
-2361
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ gradle @elastic/es-delivery
3939
build-conventions @elastic/es-delivery
4040
build-tools @elastic/es-delivery
4141
build-tools-internal @elastic/es-delivery
42-
*.gradle @elastic/es-delivery
4342
.buildkite @elastic/es-delivery
4443
.ci @elastic/es-delivery
4544
.idea @elastic/es-delivery

README.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ Quickly set up Elasticsearch and Kibana in Docker for local development or testi
5656
- If you're using Microsoft Windows, then install https://learn.microsoft.com/en-us/windows/wsl/install[Windows Subsystem for Linux (WSL)].
5757

5858
==== Trial license
59+
This setup comes with a one-month trial license that includes all Elastic features.
5960

60-
This setup comes with a one-month trial of the Elastic *Platinum* license.
6161
After the trial period, the license reverts to *Free and open - Basic*.
6262
Refer to https://www.elastic.co/subscriptions[Elastic subscriptions] for more information.
6363

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchBuildCompletePlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
1616
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
1717
import org.apache.commons.io.IOUtils;
18+
import org.elasticsearch.gradle.OS;
1819
import org.elasticsearch.gradle.util.GradleUtils;
1920
import org.gradle.api.Plugin;
2021
import org.gradle.api.Project;
@@ -61,7 +62,7 @@ public void apply(Project target) {
6162
? System.getenv("BUILD_NUMBER")
6263
: System.getenv("BUILDKITE_BUILD_NUMBER");
6364
String performanceTest = System.getenv("BUILD_PERFORMANCE_TEST");
64-
if (buildNumber != null && performanceTest == null && GradleUtils.isIncludedBuild(target) == false) {
65+
if (buildNumber != null && performanceTest == null && GradleUtils.isIncludedBuild(target) == false && OS.current() != OS.WINDOWS) {
6566
File targetFile = calculateTargetFile(target, buildNumber);
6667
File projectDir = target.getProjectDir();
6768
File gradleWorkersDir = new File(target.getGradle().getGradleUserHomeDir(), "workers/");

docs/changelog/114566.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 114566
2+
summary: Use Azure blob batch API to delete blobs in batches
3+
area: Distributed
4+
type: enhancement
5+
issues: []

docs/changelog/114990.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 114990
2+
summary: Allow for querries on `_tier` to skip shards in the `can_match` phase
3+
area: Search
4+
type: bug
5+
issues:
6+
- 114910

docs/changelog/115061.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115061
2+
summary: "[ES|QL] Simplify syntax of named parameter for identifier and pattern"
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/115117.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 115117
2+
summary: Report JVM stats for all memory pools (97046)
3+
area: Infra/Core
4+
type: bug
5+
issues:
6+
- 97046

docs/changelog/115241.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 115241
2+
summary: "[Security Solution] Add `create_index` to `kibana_system` role for index/DS\
3+
\ `.logs-endpoint.action.responses-*`"
4+
area: Authorization
5+
type: enhancement
6+
issues: []

docs/changelog/115312.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 115312
2+
summary: "ESQL: Fix filtered grouping on ords"
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 114897

docs/changelog/115383.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115383
2+
summary: Only publish desired balance gauges on master
3+
area: Allocation
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)