Merge branch 'main' into bulk-tests

Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Jun 24, 2024 · 7549e75 · 7549e75
2 parents 81b46b7 + 6e4c7ba
commit 7549e75
Show file tree

Hide file tree

Showing 6 changed files with 227 additions and 76 deletions.
diff --git a/.cspell b/.cspell
@@ -19,6 +19,7 @@ Kuromoji
 Lovins
 Lucene
 Millis
+Moneyball
 Multisearch
 Moneyball
 Nanos

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Added `created_time` and `last_updated_time` to `ml.get_model_group@200` ([#342](https://github.com/opensearch-project/opensearch-api-specification/pull/342))
 - Added spellcheck linter ([#341](https://github.com/opensearch-project/opensearch-api-specification/pull/341))
 - Added tests for response payload ([#347](https://github.com/opensearch-project/opensearch-api-specification/pull/347))
+- Added `cancel_after_time_interval` and `phase_took` in `_search` ([#353](https://github.com/opensearch-project/opensearch-api-specification/pull/353))
 - Added support for testing `application/x-ndjson` payloads ([#355](https://github.com/opensearch-project/opensearch-api-specification/pull/355))
 
 ### Changed
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ Kuromoji @@
     Lovins
     Lucene
     Millis
+    Moneyball
     Multisearch
     Moneyball
     Nanos
@@ Expand Down @@