Merge branch 'master' into rel_4_2_0

2020-02-16 09:27:05 -05:00
parent b108ef73e4 61965fb078
commit c2ee10814d
7 changed files with 268 additions and 640 deletions
--- a/src/main/resources/hapi.properties
+++ b/src/main/resources/hapi.properties
@@ -97,7 +97,6 @@ elasticsearch.enabled=false
 elasticsearch.rest_url=http://localhost:9200
 elasticsearch.username=SomeUsername
 elasticsearch.password=SomePassword
-elasticsearch.rest_url=http://localhost:9200
 elasticsearch.required_index_status=YELLOW
 elasticsearch.schema_management_strategy=CREATE
 # Immediately refresh indexes after every write. This is very bad for