Merge branch '2.1' into develop

This commit is contained in:
Markus Mäkelä
2017-08-03 15:51:15 +03:00
11 changed files with 88 additions and 47 deletions

View File

@ -93,11 +93,6 @@ if [ "$cmake_version" \< "3.7.1" ] ; then
cd ..
fi
# Flex
wget http://maxscale-jenkins.mariadb.com/x/flex-2.5.35-0.8.el5.rfb.x86_64.rpm
sudo yum install flex-2.5.35-0.8.el5.rfb.x86_64.rpm -y --nogpgcheck
rm flex-2.5.35-0.8.el5.rfb.x86_64*
# RabbitMQ C client
mkdir rabbit
cd rabbit