Merge branch 'develop' into stable

This commit is contained in:
Pedro Algarvio 2015-08-06 14:37:43 +01:00
commit 4584f5e5d8
2 changed files with 2 additions and 2 deletions

View file

@ -1,4 +1,4 @@
Version 2015.07.xx:
Version 2015.08.06:
* Fix python-requests installations for Ubuntu >= 14.04 LTS. #631, #632, #633
* Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
* Exit the git checkout directory before deleting it. Thanks Bret Fisher. #634

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="2015.07.22"
__ScriptVersion="2015.08.06"
__ScriptName="bootstrap-salt.sh"
#======================================================================================================================