Skip to content

Commit af21543

Browse files
alexey-ivanov-esalexey-ivanov-es
authored
Merge branch 'main' into settings_breaking_changes_warning
2 parents f0271f9 + b663616 commit af21543

File tree

553 files changed

+6114
-3324
lines changed

Some content is hidden

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

553 files changed

+6114
-3324
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,7 @@ indent_size = 4
209209
max_line_length = 140
210210
ij_java_class_count_to_use_import_on_demand = 999
211211
ij_java_names_count_to_use_import_on_demand = 999
212-
# The first '@*,' is a workaround for https://youtrack.jetbrains.com/issue/IDEA-368382/Auto-import-puts-java-imports-first-even-when-Editor-Code-style-Java-Import-layout-puts-them-last
213-
# it should be removed once that is fixed
214-
ij_java_imports_layout = @*,*,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
212+
ij_java_imports_layout = *,|,com.**,|,org.**,|,java.**,|,javax.**,|,$*
215213

216214
[*.json]
217215
indent_size = 2

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def generateUpgradeCompatibilityFile = tasks.register("generateUpgradeCompatibil
241241
}
242242

243243
def upgradeCompatibilityZip = tasks.register("upgradeCompatibilityZip", Zip) {
244-
archiveFile.set(project.layout.buildDirectory.file("rolling-upgrade-compatible-${VersionProperties.elasticsearch}.zip"))
244+
archiveFile.set(project.layout.buildDirectory.file("distributions/rolling-upgrade-compatible-${VersionProperties.elasticsearch}.zip"))
245245
from(generateUpgradeCompatibilityFile)
246246
}
247247

‎docs/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ To re-run CI checks, an Elastic employee can select the `Re-run this job` option
4949

5050
> [!TIP]
5151
As of 9.0.0, we are currently only publishing from the `main` branch.
52-
**This means that backporting is currently not necessary for 9.0+ Elasticsearch docs.**
52+
We will continue to backport changes as usual, in case we need to revisit this approach in the future.
5353

54-
However, if you need to update the `8.x` docs, you'll have to use the old `asciidoc` system. Refer to the [`8.x` README](https://github.com/elastic/elasticsearch/blob/8.x/docs/README.asciidoc) for more information.
54+
If you need to update the `8.x` docs, you'll have to use the old `asciidoc` system. Refer to the [`8.x` README](https://github.com/elastic/elasticsearch/blob/8.x/docs/README.asciidoc) for more information.
5555

5656
> [!NOTE]
5757
> If you need to make changes to 9.x docs and 8.x docs, you'll need to use two different workflows:
5858
59-
- **For `9.x` docs**, create a PR using the new Markdown system against the `main` branch.
59+
- **For `9.x` docs**, create a PR using the new Markdown system against the `main` branch and backport as necessary.
6060
- **For `8.x` docs**, create a PR using the old AsciiDoc system against the `8.x` branch and backport the changes to any other `8.x` branches needed.
6161

6262
## Test code snippets

‎docs/changelog/122486.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122486
2+
summary: Add index mode to get data stream API
3+
area: Data streams
4+
type: enhancement
5+
issues: []

‎docs/changelog/122606.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122606
2+
summary: Avoid serializing empty `_source` fields in mappings
3+
area: Mapping
4+
type: bug
5+
issues: []

‎docs/changelog/122615.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pr: 122615
2+
summary: Enable synthetic recovery source by default when synthetic source is enabled.
3+
Using synthetic recovery source significantly improves indexing performance compared
4+
to regular recovery source.
5+
area: Mapping
6+
type: enhancement
7+
issues:
8+
- 116726

‎docs/changelog/122890.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122890
2+
summary: Introduce `allow_partial_results` setting in ES|QL
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/123543.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 123543
2+
summary: Enhance memory accounting for document expansion and introduce max document
3+
size limit
4+
area: CRUD
5+
type: enhancement
6+
issues: []

‎docs/changelog/123589.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123589
2+
summary: Revive some more of inlinestats functionality
3+
area: ES|QL
4+
type: bug
5+
issues: []

‎docs/changelog/123743.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 123743
2+
summary: Adjust exception thrown when unable to load hunspell dict
3+
area: Analysis
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)