diff options
| author | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-02-19 11:19:39 +0000 |
| commit | f8289eb286d00c29859a8df495b957c7b46cb249 (patch) | |
| tree | 1bc18d6a3a795482c7229786f7ab427fabbcd007 /vendor/gopkg.in/olivere/elastic.v5/.travis.yml | |
| parent | 8891fa2a5e9e08eb9fa99ec163c47a6e9761a816 (diff) | |
| parent | 30197584d5a215a3b25bffa79a034ed9e360cf52 (diff) | |
| download | chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.gz chat-f8289eb286d00c29859a8df495b957c7b46cb249.tar.bz2 chat-f8289eb286d00c29859a8df495b957c7b46cb249.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'vendor/gopkg.in/olivere/elastic.v5/.travis.yml')
| -rw-r--r-- | vendor/gopkg.in/olivere/elastic.v5/.travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml index b4322c13c..9658f873a 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/.travis.yml +++ b/vendor/gopkg.in/olivere/elastic.v5/.travis.yml @@ -12,4 +12,4 @@ services: - docker before_install: - sudo sysctl -w vm.max_map_count=262144 - - docker run -d --rm -p 9200:9200 -e "http.host=0.0.0.0" -e "transport.host=127.0.0.1" -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch:6.1.2 elasticsearch -Expack.security.enabled=false -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ + - docker run -d --rm -p 9200:9200 -e "http.host=0.0.0.0" -e "transport.host=127.0.0.1" -e "bootstrap.memory_lock=true" -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.1 elasticsearch -Enetwork.host=_local_,_site_ -Enetwork.publish_host=_local_ |