Skip to content

Commit 57f1559

Browse files
authored
Merge branch '9.2' into backport-5523-to-9.2
2 parents a50425f + 3009faf commit 57f1559

File tree

96 files changed

+781
-266
lines changed

Some content is hidden

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

96 files changed

+781
-266
lines changed

.github/workflows/validate-apis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ jobs:
9393
with:
9494
path: ./clients-flight-recorder/recordings/types-validation/types-validation.json
9595
key: types-validation-json-${{ format('{0}-{1}', github.ref_name, github.sha) }}
96-
restore-keys: |
97-
types-validation-json-${{ github.ref_name }}-
9896

9997
- name: Run validation (PR)
10098
if: github.event_name == 'pull_request'

compiler/.prettierrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"singleQuote": true,
77
"quoteProps": "as-needed",
88
"bracketSpacing": true,
9-
"endOfLine": "lf",
9+
"endOfLine": "auto",
1010
"bracketSameLine": true
1111
}

docs/overlays/elasticsearch-openapi-overlays.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ actions:
1414
1515
## Documentation source and versions
1616
17-
This documentation is derived from the `main` branch of the [elasticsearch-specification](https://github.com/elastic/elasticsearch-specification) repository.
17+
This documentation is derived from the `9.2` branch of the [elasticsearch-specification](https://github.com/elastic/elasticsearch-specification) repository.
1818
It is provided under license [Attribution-NonCommercial-NoDerivatives 4.0 International](https://creativecommons.org/licenses/by-nc-nd/4.0/).
1919
2020
This documentation contains work-in-progress information for future Elastic Stack releases.
@@ -73,4 +73,4 @@ actions:
7373
- target: "$.components['schemas']['cat._types.CatNodeColumn']"
7474
description: Add basic string data type for cat node columns
7575
update:
76-
type: string
76+
type: string

output/openapi/elasticsearch-openapi.json

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

output/openapi/elasticsearch-serverless-openapi.json

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

0 commit comments

Comments
 (0)