diff options
| author | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
| commit | f8289eb286d00c29859a8df495b957c7b46cb249 (patch) | |
| tree | 1bc18d6a3a795482c7229786f7ab427fabbcd007 /vendor/github.com/olivere/elastic/search.go | |
| parent | 8891fa2a5e9e08eb9fa99ec163c47a6e9761a816 (diff) | |
| parent | 30197584d5a215a3b25bffa79a034ed9e360cf52 (diff) | |
| download | chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.gz chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.bz2 chat-f8289eb286d00c29859a8df495b957c7b46cb249.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'vendor/github.com/olivere/elastic/search.go')
| -rw-r--r-- | vendor/github.com/olivere/elastic/search.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vendor/github.com/olivere/elastic/search.go b/vendor/github.com/olivere/elastic/search.go index 12d51bf1f..034b12096 100644 --- a/vendor/github.com/olivere/elastic/search.go +++ b/vendor/github.com/olivere/elastic/search.go @@ -111,8 +111,7 @@ func (s *SearchService) TimeoutInMillis(timeoutInMillis int) *SearchService { } // SearchType sets the search operation type. Valid values are: -// "query_then_fetch", "query_and_fetch", "dfs_query_then_fetch", -// "dfs_query_and_fetch", "count", "scan". +// "dfs_query_then_fetch" and "query_then_fetch". // See https://www.elastic.co/guide/en/elasticsearch/reference/6.0/search-request-search-type.html // for details. func (s *SearchService) SearchType(searchType string) *SearchService { |