Skip to content

G
gitlab-ce
Commit 04d40deb authored by Sean McGivern's avatar Sean McGivern
Browse files
Options

Merge branch 'fix-elasticsearch-docs' into 'master' 

Fix GitLab version for elasticsearch

See merge request gitlab-org/gitlab-ee!8049
parents 506a5f8f 95df5275
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
doc/integration/elasticsearch.md
View file @ 04d40deb
...@@ -16,8 +16,8 @@ special searches: ...@@ -16,8 +16,8 @@ special searches:
| GitLab version | Elasticsearch version | | GitLab version | Elasticsearch version |
| -------------- | --------------------- | | -------------- | --------------------- |
| GitLab Enterprise Edition 8.4 - 8.17 | Elasticsearch 2.4 with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed | | GitLab Enterprise Edition 8.4 - 8.17 | Elasticsearch 2.4 with [Delete By Query Plugin](https://www.elastic.co/guide/en/elasticsearch/plugins/2.4/plugins-delete-by-query.html) installed |
| GitLab Enterprise Edition 9.0+ | Elasticsearch 5.1 - 5.5 | | GitLab Enterprise Edition 9.0 - 11.4 | Elasticsearch 5.1 - 5.5 |
| GitLab Enterprise Edition 11.4+ | Elasticsearch 5.6 - 6.x | | GitLab Enterprise Edition 11.5+ | Elasticsearch 5.6 - 6.x |
## Installing Elasticsearch ## Installing Elasticsearch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7