Skip to content

Commit d1fbaab

Browse files
ChrisHegartyChrisHegarty
committed
Merge branch 'main' into lucene_snapshot
2 parents fb44c63 + 33af77b commit d1fbaab

File tree

256 files changed

+9746
-1461
lines changed

Some content is hidden

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

256 files changed

+9746
-1461
lines changed

‎.buildkite/scripts/lucene-snapshot/update-branch.sh‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,12 @@ if [[ "$BUILDKITE_BRANCH" != "lucene_snapshot"* ]]; then
77
exit 1
88
fi
99

10-
if [[ "$BUILDKITE_BRANCH" == "lucene_snapshot_10" ]]; then
11-
UPSTREAM="main"
12-
elif [[ "$BUILDKITE_BRANCH" == "lucene_snapshot" ]]; then
13-
UPSTREAM="8.x"
14-
else
15-
echo "Error: unknown branch: $BUILDKITE_BRANCH"
16-
exit 1
17-
fi
18-
19-
echo --- Updating "$BUILDKITE_BRANCH" branch with "$UPSTREAM"
10+
echo --- Updating "$BUILDKITE_BRANCH" branch with main
2011

2112
git config --global user.name elasticsearchmachine
2213
git config --global user.email '[email protected]'
2314

2415
git checkout "$BUILDKITE_BRANCH"
25-
git fetch origin "$UPSTREAM"
26-
git merge --no-edit "origin/$UPSTREAM"
16+
git fetch origin main
17+
git merge --no-edit origin/main
2718
git push origin "$BUILDKITE_BRANCH"

‎distribution/archives/integ-test-zip/src/javaRestTest/java/org/elasticsearch/test/rest/RequestsWithoutContentIT.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ public void testIndexMissingBody() throws IOException {
2727
}
2828

2929
public void testBulkMissingBody() throws IOException {
30-
ResponseException responseException = expectThrows(
31-
ResponseException.class,
32-
() -> client().performRequest(new Request(randomBoolean() ? "POST" : "PUT", "/_bulk"))
33-
);
30+
Request request = new Request(randomBoolean() ? "POST" : "PUT", "/_bulk");
31+
request.setJsonEntity("");
32+
ResponseException responseException = expectThrows(ResponseException.class, () -> client().performRequest(request));
3433
assertResponseException(responseException, "request body is required");
3534
}
3635

‎docs/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
123123

124124
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
125125
requiresFeature 'es.failure_store_feature_flag_enabled', Version.fromString("8.12.0")
126+
requiresFeature 'es.ccs_telemetry_feature_flag_enabled', Version.fromString("8.16.0")
126127

127128
// TODO Rene: clean up this kind of cross project file references
128129
extraConfigFile 'op-jwks.json', project(':x-pack:test:idp-fixture').file("src/main/resources/oidc/op-jwks.json")

‎docs/changelog/111770.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 111770
2+
summary: Integrate IBM watsonx to Inference API for text embeddings
3+
area: Experiences
4+
type: enhancement
5+
issues: []

‎docs/changelog/112481.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112481
2+
summary: Validate streaming HTTP Response
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/112565.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112565
2+
summary: Server-Sent Events for Inference response
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

‎docs/changelog/112571.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
pr: 112571
2+
summary: Deprecate dot-prefixed indices and composable template index patterns
3+
area: CRUD
4+
type: deprecation
5+
issues: []
6+
deprecation:
7+
title: Deprecate dot-prefixed indices and composable template index patterns
8+
area: CRUD
9+
details: "Indices beginning with a dot '.' are reserved for system and internal\
10+
\ indices, and should not be used by and end-user. Additionally, composable index\
11+
\ templates that contain patterns for dot-prefixed indices should also be avoided,\
12+
\ as these patterns are meant for internal use only. In a future Elasticsearch\
13+
\ version, creation of these dot-prefixed indices will no longer be allowed."
14+
impact: "Requests performing an action that would create an index beginning with\
15+
\ a dot (indexing a document, manual creation, reindex), or creating an index\
16+
\ template with index patterns beginning with a dot, will contain a deprecation\
17+
\ header warning about dot-prefixed indices in the response."

‎docs/changelog/112874.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112874
2+
summary: Reduce heap usage for `AggregatorsReducer`
3+
area: Aggregations
4+
type: enhancement
5+
issues: []

‎docs/changelog/112895.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 112895
2+
summary: (logger) change from error to warn for short circuiting user
3+
area: Security
4+
type: enhancement
5+
issues: []

‎docs/reference/esql/functions/description/categorize.asciidoc‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)