You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2021/06/12 11:12:08 UTC
[incubator-ponymail] branch master updated: Bug: PM setup does not
support ES 6 - undocumented
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.git
The following commit(s) were added to refs/heads/master by this push:
new 6aad371 Bug: PM setup does not support ES 6 - undocumented
6aad371 is described below
commit 6aad371c8ee683bf50bdf83b626367c46ca90b73
Author: Sebb <se...@apache.org>
AuthorDate: Sat Jun 12 12:11:08 2021 +0100
Bug: PM setup does not support ES 6 - undocumented
This fixes #536
---
CHANGELOG.md | 2 +-
docs/INSTALLING.md | 2 +-
requirements.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a34d9fd..63abbf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
## Changes in 0.12:
-- Bug: PM does not support ES 7 - undocumented (#536)
+- Bug: PM setup does not support ES 6 - undocumented (#536)
- Bug: buffering=1 not allowed with binary files (#534)
- Bug: Invalid mailing list address supplied (#516)
- Enh: stats.lua could return monthly stats to show in calendar (#532)
diff --git a/docs/INSTALLING.md b/docs/INSTALLING.md
index 504d1ed..fe5bd11 100644
--- a/docs/INSTALLING.md
+++ b/docs/INSTALLING.md
@@ -14,7 +14,7 @@ Otherwise, read the next two chapters:
## Pre-requisites ##
You will need the following software installed on your machine:
-- ElasticSearch >= 2.1 and < 7.0 (does not support 7.x+)
+- ElasticSearch >= 2.1 and < 6.0 (setup.py does not support 6.x+; the code may perhaps run on 6.x)
- Python 3.x for the archiver plugin (setup.py will handle dependencies) and importer
- Python `html2text` package (GPLv3) if you wish to archive HTML-only mails (remember to add the `--html2text` command line arg)
- Apache HTTP Server 2.4.x with mod_lua (see http://modlua.org/gs/installing if you need to build mod_lua manually)
diff --git a/requirements.txt b/requirements.txt
index da871fc..efa8e24 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,6 @@
# N.B. modules with license that are compatible with AL 2.0 should be included here
# As such, html2text (GPL) and chardet (GPL) cannot be included
certifi # MPL 2.0
-elasticsearch # AL2.0
+elasticsearch < 6.0.0 # AL2.0
formatflowed # Python Software Foundation
netaddr # BSD License, MIT License