Commit 116effe8 by Edward Zarecor

merge conflict

parent 8e611bd1
...@@ -8,8 +8,6 @@ rvm: ...@@ -8,8 +8,6 @@ rvm:
cache: bundler cache: bundler
before_install: before_install:
- gem update bundler # Ensure we use the latest version of bundler. Travis' default version of outdated.
# Run Elasticsearch as a daemon # Run Elasticsearch as a daemon
- curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.13.zip - curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.13.zip
- unzip elasticsearch-0.90.13.zip - unzip elasticsearch-0.90.13.zip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment