[incubator-ponymail-foal] 01/02: Minimum ES 6.0 version

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit f5dfdee16adce26ce7a2bf7d2e3341423fcec201
Author: Sebb <se...@apache.org>
AuthorDate: Thu Aug 20 15:38:04 2020 +0100

    Minimum ES 6.0 version
---
 tools/plugins/elastic.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/plugins/elastic.py b/tools/plugins/elastic.py
index 4ae4fc1..5b2421c 100755
--- a/tools/plugins/elastic.py
+++ b/tools/plugins/elastic.py
@@ -100,9 +100,7 @@ class Elastic:
         )
 
         es_engine_major = self.engineMajor()
-        if es_engine_major == 2:
-            pass
-        elif es_engine_major in [5, 6, 7]:
+        if es_engine_major in [6, 7]:
             self.wait_for_active_shards = config.get("elasticsearch", "wait", fallback=1)
         else:
             raise Exception("Unexpected elasticsearch version ", es_engine_major)