Skip to content

Commit bbd87ac

Browse files
committed
Merge branch 'main' into feature/apis
2 parents e61f293 + 7b8f4fb commit bbd87ac

File tree

85 files changed

+1149
-378
lines changed

Some content is hidden

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

85 files changed

+1149
-378
lines changed

.buildkite/scripts/dra-workflow.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ echo --- Building release artifacts
7171
buildReleaseArtifacts \
7272
exportCompressedDockerImages \
7373
exportDockerContexts \
74+
:zipAggregation \
7475
:distribution:generateDependenciesReport
7576

7677
PATH="$PATH:${JAVA_HOME}/bin" # Required by the following script

build-tools-internal/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=d7042b3c11565c192041fc8c4703f541b888286404b4f267138c1d094d8ecdca
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
3+
distributionSha256Sum=443c9c8ee2ac1ee0e11881a40f2376d79c66386264a44b24a9f8ca67e633375f
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

build-tools-internal/src/main/resources/changelog-schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
"Rollup",
8787
"SQL",
8888
"Search",
89+
"Searchable Snapshots",
8990
"Security",
9091
"Snapshot/Restore",
9192
"Stats",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.14.1
1+
8.14.2

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ nmcpAggregation {
6868
}
6969

7070
tasks.named('zipAggregation').configure {
71+
// put this in a place that works well with our DRA infrastructure
72+
archiveFileName.unset();
73+
archiveBaseName.set("elasticsearch-maven-aggregation")
74+
archiveVersion.set(VersionProperties.elasticsearch)
75+
destinationDirectory.set(layout.buildDirectory.dir("distributions"));
76+
7177
dependsOn gradle.includedBuild('build-tools').task(':zipElasticPublication')
7278
from(zipTree(gradle.includedBuild('build-tools').task(':zipElasticPublication').resolveTask().archiveFile.get()))
7379
}

docs/changelog/128910.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128910
2+
summary: Fix `FieldAttribute` name usage in `InferNonNullAggConstraint`
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/128913.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128913
2+
summary: "[apm-data] Enable 'date_detection' for all apm data streams"
3+
area: Data streams
4+
type: enhancement
5+
issues: []

docs/changelog/129164.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129164
2+
summary: Log partial failures
3+
area: ES|QL
4+
type: feature
5+
issues: []

docs/changelog/129245.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129245
2+
summary: Throttle indexing when disk IO throttling is disabled
3+
area: Engine
4+
type: enhancement
5+
issues: []

docs/reference/query-languages/esql/_snippets/lists/search-functions.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
* [preview] [`MATCH`](../../functions-operators/search-functions.md#esql-match)
33
* [preview] [`MATCH_PHRASE`](../../functions-operators/search-functions.md#esql-match_phrase)
44
* [preview] [`QSTR`](../../functions-operators/search-functions.md#esql-qstr)
5-
% * [preview] [
6-
`TERM`](../../functions-operators/search-functions.md#esql-term)
5+
% * [preview] [`TERM`](../../functions-operators/search-functions.md#esql-term)

0 commit comments

Comments
 (0)