Merge branch 'master' into jaegertracing#1921-2

guo0693 · Nov 22, 2019 · 4ee17f5 · 4ee17f5
2 parents 6539d27 + 115f931
commit 4ee17f5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugin/storage/es/Dockerfile.rollover b/plugin/storage/es/Dockerfile.rollover
@@ -3,7 +3,7 @@ FROM python:3-alpine
 # Temporary fix for https://github.com/jaegertracing/jaeger/issues/1494
 RUN pip install urllib3==1.21.1
 
-RUN pip install elasticsearch elasticsearch-curator
+RUN pip install elasticsearch elasticsearch-curator pathlib2
 COPY ./mappings/* /mappings/
 COPY esRollover.py /es-rollover/
 

diff --git a/plugin/storage/es/esRollover.py b/plugin/storage/es/esRollover.py
@@ -8,7 +8,7 @@
 import requests
 import ssl
 import sys
-from pathlib import Path
+from pathlib2 import Path
 from requests.auth import HTTPBasicAuth