Merge branch 'develop' into stable

This commit is contained in:
Pedro Algarvio 2014-08-23 14:09:29 +01:00
commit c14c38b74d
2 changed files with 2 additions and 2 deletions

View file

@ -1,4 +1,4 @@
Version 2014.xx.xx:
Version 2014.08.23:
* Avoid redirect breakage when installing EPEL with rpm on RHEL 5
* Ensure python-apt is installed by the bootstrap script for Debian & Ubuntu minions. Thanks
@garethgreenaway.

View file

@ -17,7 +17,7 @@
# CREATED: 10/15/2012 09:49:37 PM WEST
#======================================================================================================================
set -o nounset # Treat unset variables as an error
__ScriptVersion="2014.07.29"
__ScriptVersion="2014.08.23"
__ScriptName="bootstrap-salt.sh"
#======================================================================================================================