Skip to content

Commit cc1098b

Browse files
committed
Use new merge_type wording
1 parent d46b4db commit cc1098b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

output/openapi/elasticsearch-openapi.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/schema/schema.json

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

specification/simulate/ingest/SimulateIngestRequest.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ export interface Request extends RequestBase {
7676
*/
7777
pipeline?: PipelineName
7878
/**
79-
* The method to be used when merging mapping_additions existing mappings. Mappings can be merged in the way mapping changes are merged into an existing index, or in
80-
* the way mapping changes are merged into existing templates. Some changes are allowed to templates that are not allowed to indices. For example,
81-
* a field cannot be changed to an incompatible type in an index, but can in a template.
79+
* The mapping merge type if mapping overrides are being provided in mapping_addition.
80+
* The allowed values are one of index or template.
81+
* The index option merges mappings the way they would be merged into an existing index.
82+
* The template option merges mappings the way they would be merged into a template.
8283
* @server_default index
8384
*/
8485
merge_type?: MergeType

0 commit comments

Comments
 (0)