Merge conflict

This commit is contained in:
Arthur Barr
2018-03-05 10:59:41 +00:00
2 changed files with 2 additions and 1 deletions

View File

@@ -20,5 +20,6 @@ install:
- echo nothing - echo nothing
script: script:
- make deps
- make build-devserver - make build-devserver
- make test-devserver - make test-devserver

View File

@@ -77,7 +77,7 @@ $RHEL && yum -y install \
# Download and extract the MQ installation files # Download and extract the MQ installation files
DIR_EXTRACT=/tmp/mq DIR_EXTRACT=/tmp/mq
mkdir -p ${DIR_EXTRACT} mkdir -p ${DIR_EXTRACT}
cd ${DIR_EXTRACT} cd ${DIR_EXTRACT}
curl -LO $MQ_URL curl -LO $MQ_URL
tar -zxvf ./*.tar.gz tar -zxvf ./*.tar.gz