Skip to content

Commit 8a5b342

Browse files
authored
Merge branch 'main' into simplify_esql_response
2 parents 4cbbb83 + 61594da commit 8a5b342

File tree

4 files changed

+5
-110
lines changed

4 files changed

+5
-110
lines changed

docs/reference/elasticsearch/mapping-reference/keyword.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,14 @@ It is both allowed to submit documents that don’t have a value for the field o
295295
```console
296296
POST logs-debug/_doc
297297
{
298-
"date": "2019-12-12",
298+
"@timestamp": "2019-12-12",
299299
"message": "Starting up Elasticsearch",
300300
"level": "debug"
301301
}
302302

303303
POST logs-debug/_doc
304304
{
305-
"date": "2019-12-12",
305+
"@timestamp": "2019-12-12",
306306
"message": "Starting up Elasticsearch"
307307
}
308308
```

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/LifecycleExecutionStateUtils.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/LifecycleExecutionStateUtilsTests.java

Lines changed: 0 additions & 58 deletions
This file was deleted.

x-pack/plugin/esql/qa/testFixtures/src/main/resources/fork.csv-spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ null | null | fork2 | spike
706706

707707
forkBeforeCompletion
708708
required_capability: fork_v8
709+
required_capability: completion
709710

710711
FROM employees
711712
| KEEP emp_no, first_name, last_name
@@ -724,6 +725,7 @@ emp_no:integer | first_name:keyword | last_name:keyword | _fork:keyword | x:keyw
724725

725726
forkBranchWithCompletion
726727
required_capability: fork_v8
728+
required_capability: completion
727729

728730
FROM employees
729731
| KEEP emp_no, first_name, last_name
@@ -742,6 +744,7 @@ emp_no:integer | first_name:keyword | last_name:keyword | x:keyword | _fo
742744

743745
forkAfterCompletion
744746
required_capability: fork_v8
747+
required_capability: completion
745748

746749
FROM employees
747750
| KEEP emp_no, first_name, last_name

0 commit comments

Comments
 (0)