Merge branch 'main' into cleanup-remove-old-todo-bulk-operation

Author: jbaiera

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java

@@ -329,7 +329,7 @@ static Path findAgentJar(String installDir) throws IOException, UserException {
 
         try (var apmStream = Files.list(apmModule)) {
             final List<Path> paths = apmStream.filter(
-                path -> path.getFileName().toString().matches("elastic-apm-agent-\\d+\\.\\d+\\.\\d+\\.jar")
+                path -> path.getFileName().toString().matches("elastic-apm-agent-java8-\\d+\\.\\d+\\.\\d+\\.jar")
             ).toList();
 
             if (paths.size() > 1) {

distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java

@@ -141,7 +141,7 @@ private Path makeFakeAgentJar() throws IOException {
         Path tempFile = createTempFile();
         Path apmPathDir = tempFile.getParent().resolve("modules").resolve("apm");
         Files.createDirectories(apmPathDir);
-        Path apmAgentFile = apmPathDir.resolve("elastic-apm-agent-0.0.0.jar");
+        Path apmAgentFile = apmPathDir.resolve("elastic-apm-agent-java8-0.0.0.jar");
         Files.move(tempFile, apmAgentFile);
 
         return tempFile.getParent();

docs/changelog/131723.yaml

@@ -0,0 +1,5 @@
+pr: 131723
+summary: Tests for FORK's evaluation of field names used in `field_caps` resolve calls
+area: Search
+type: bug
+issues: []

docs/changelog/132131.yaml

@@ -0,0 +1,7 @@
+pr: 132131
+summary: Updating `TransportSimulateIndexTemplateAction.resolveTemplate()` to account
+  for data stream overrides
+area: Indices APIs
+type: bug
+issues:
+ - 131425

docs/changelog/132210.yaml

@@ -0,0 +1,6 @@
+pr: 132210
+summary: Adding a `merge_type` parameter to the ingest simulate API
+area: Ingest Node
+type: enhancement
+issues:
+ - 131608

docs/changelog/132646.yaml

@@ -0,0 +1,5 @@
+pr: 132646
+summary: Update EIS sparse and dense embedding max batch size to 16
+area: Machine Learning
+type: bug
+issues: []

docs/changelog/132651.yaml

@@ -0,0 +1,5 @@
+pr: 132651
+summary: Use java8 variant of apm-agent
+area: Infra/Core
+type: upgrade
+issues: []

docs/release-notes/breaking-changes.md

@@ -12,9 +12,6 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
 
 % ## Next version [elasticsearch-nextversion-breaking-changes]
 
-```{applies_to}
-stack: coming 9.1.1
-```
 ## 9.1.1 [elasticsearch-9.1.1-breaking-changes]
 
 There are no breaking changes associated with this release.

docs/release-notes/changelog-bundles/9.1.1.yml

@@ -1,6 +1,6 @@
 version: 9.1.1
-released: false
-generated: 2025-08-06T08:42:03.230079779Z
+released: true
+generated: 2025-08-07T10:37:38.264033861Z
 changelogs:
   - pr: 130279
     summary: Fix missing removal of query cancellation callback in QueryPhase

docs/release-notes/deprecations.md

@@ -16,9 +16,6 @@ To give you insight into what deprecated features you’re using, {{es}}:
 
 % ## Next version [elasticsearch-nextversion-deprecations]
 
-```{applies_to}
-stack: coming 9.1.1
-```
 ## 9.1.1 [elasticsearch-9.1.1-deprecations]
 
 There are no deprecations associated with this release.