Merge conflict
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user