set the 1.2 API to actually be used as the default

This commit is contained in:
Spencer Alger
2014-05-22 08:26:58 -07:00
parent 3d8a81038e
commit c1f1f40194
5 changed files with 14 additions and 14 deletions

View File

@ -71,12 +71,11 @@ function manage_es {
local ES_URL="https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_RELEASE}.zip"
local ES_DIR="${SNAPSHOTS}/${ES_VERSION}"
else
if [[ $ES_BRANCH == "master" ]]; then
local JDK='JDK7'
elif [[ $ES_BRANCH == "1.x" ]]; then
local JDK='JDK7'
else
local JDK='JDK6'
# TODO: TRASH THIS
if [[ $ES_BRANCH == "master" ]]; then local JDK='JDK7'
elif [[ $ES_BRANCH == "1.x" ]]; then local JDK='JDK7'
elif [[ $ES_BRANCH == "1.2" ]]; then local JDK='JDK7'
else local JDK='JDK6'
fi
local ES_VERSION="${ES_BRANCH}_nightly"