Skip to content

Commit 126d752

Browse files
authored
Merge branch 'main' into esql-dls-opt-in-ccs-test
2 parents 72a968d + 1e5d9b9 commit 126d752

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docs/reference/docs/bulk.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,10 @@ include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=refresh]
257257
(Optional, Boolean) If `true`, the request's actions must target an index alias.
258258
Defaults to `false`.
259259

260+
`require_data_stream`::
261+
(Optional, Boolean) If `true`, the request's actions must target a data stream (existing or to-be-created).
262+
Defaults to `false`.
263+
260264
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=routing]
261265

262266
include::{es-ref-dir}/rest-api/common-parms.asciidoc[tag=source]

rest-api-spec/src/main/resources/rest-api-spec/api/bulk.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
"type":"time",
5757
"description":"Explicit operation timeout"
5858
},
59-
"type":{
60-
"type":"string",
61-
"description":"Default document type for items which don't provide one"
62-
},
6359
"_source":{
6460
"type":"list",
6561
"description":"True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request"
@@ -78,11 +74,11 @@
7874
},
7975
"require_alias": {
8076
"type": "boolean",
81-
"description": "Sets require_alias for all incoming documents. Defaults to unset (false)"
77+
"description": "If true, the request’s actions must target an index alias. Defaults to false."
8278
},
8379
"require_data_stream": {
8480
"type": "boolean",
85-
"description": "When true, requires the destination to be a data stream (existing or to-be-created). Default is false"
81+
"description": "If true, the request's actions must target a data stream (existing or to-be-created). Default to false"
8682
},
8783
"list_executed_pipelines": {
8884
"type": "boolean",

server/src/main/java/org/elasticsearch/index/IndexVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private static Version parseUnchecked(String version) {
5858
}
5959
}
6060

61-
@UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remove the index versions with which v9 will not need to interact
61+
@UpdateForV9(owner = UpdateForV9.Owner.SEARCH_FOUNDATIONS) // remove the index versions with which v9 will not need to interact
6262
public static final IndexVersion ZERO = def(0, Version.LATEST);
6363

6464
public static final IndexVersion V_7_0_0 = def(7_00_00_99, parseUnchecked("8.0.0"));

0 commit comments

Comments
 (0)