Skip to content

Commit 2fc7e76

Browse files
piergmpiergm
authored
Merge branch 'elastic:main' into bugfix/highlighting-for-constant_keyword-field-type
2 parents 673f204 + ccca57b commit 2fc7e76

File tree

478 files changed

+6111
-2962
lines changed

Some content is hidden

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

478 files changed

+6111
-2962
lines changed

‎.backportrc.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"upstream" : "elastic/elasticsearch",
3-
"targetBranchChoices" : [ "main", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
3+
"targetBranchChoices" : [ "main", "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-
"^v8.9.0$" : "main",
6+
"^v8.10.0$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,4 @@ BWC_VERSION:
9191
- "8.8.1"
9292
- "8.8.2"
9393
- "8.9.0"
94+
- "8.10.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ BWC_VERSION:
22
- "7.17.11"
33
- "8.8.2"
44
- "8.9.0"
5+
- "8.10.0"

‎README.asciidoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
= Elasticsearch
22

3-
Elasticsearch is the distributed, RESTful search and analytics engine at the
4-
heart of the https://www.elastic.co/products[Elastic Stack]. You can use
5-
Elasticsearch to store, search, and manage data for:
3+
Elasticsearch is a distributed, RESTful search engine optimized for speed and relevance on production-scale workloads. You can use Elasticsearch to perform real-time search over massive datasets for applications including:
64

5+
* Vector search
6+
* Full-text search
77
* Logs
88
* Metrics
9-
* A search backend
10-
* Application monitoring
11-
* Endpoint security
9+
* Application performance monitoring (APM)
10+
* Security logs
11+
1212
1313
\... and more!
1414

‎build-tools-internal/version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 8.9.0
1+
elasticsearch = 8.10.0
22
lucene = 9.7.0-snapshot-41cd1f7a88c
33

44
bundled_jdk_vendor = openjdk
@@ -15,7 +15,7 @@ log4j = 2.19.0
1515
slf4j = 2.0.6
1616
ecsLogging = 1.2.0
1717
jna = 5.10.0
18-
netty = 4.1.92.Final
18+
netty = 4.1.94.Final
1919
commons_lang3 = 3.9
2020
google_oauth_client = 1.34.1
2121

‎distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/RemovePluginActionTests.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public void testNoConfigDirPreserved() throws Exception {
234234
public void testRemoveUninstalledPluginErrors() throws Exception {
235235
UserException e = expectThrows(UserException.class, () -> removePlugin("fake", home, randomBoolean()));
236236
assertEquals(ExitCodes.CONFIG, e.exitCode);
237-
assertEquals("plugin [fake] not found; run 'elasticsearch-plugin list' to get list of installed plugins", e.getMessage());
237+
assertThat(e.getMessage(), containsString("plugin [fake] not found"));
238238

239239
MockTerminal terminal = MockTerminal.create();
240240

@@ -245,10 +245,7 @@ public void testRemoveUninstalledPluginErrors() throws Exception {
245245
BufferedReader errorReader = new BufferedReader(new StringReader(terminal.getErrorOutput()))
246246
) {
247247
assertThat(errorReader.readLine(), equalTo(""));
248-
assertThat(
249-
errorReader.readLine(),
250-
equalTo("ERROR: plugin [fake] not found; run 'elasticsearch-plugin list' to get list of installed plugins")
251-
);
248+
assertThat(errorReader.readLine(), containsString("plugin [fake] not found"));
252249
assertThat(reader.readLine(), nullValue());
253250
assertThat(errorReader.readLine(), nullValue());
254251
}

‎docs/changelog/92574.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 92574
2+
summary: cleanup some code NoriTokenizerFactory and KuromojiTokenizerFactory
3+
area: Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/95512.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pr: 95512
2-
summary: Adding `manage_dlm` index privilege and expanding `view_index_metadata` for access to data lifecycle APIs
2+
summary: Adding `manage_data_stream_lifecycle` index privilege and expanding `view_index_metadata` for access to data stream lifecycle APIs
33
area: DLM
44
type: enhancement
55
issues: []

‎docs/changelog/96551.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 96551
2+
summary: Make cluster health API cancellable
3+
area: Distributed
4+
type: bug
5+
issues: []

‎docs/changelog/96785.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 96785
2+
summary: Adding null check to fix potential NPE
3+
area: Transform
4+
type: enhancement
5+
issues:
6+
- 96781

0 commit comments

Comments
 (0)