Merge branch 'develop' into stable

s0undt3ch · s0undt3ch · commit c14c38b74d30 · 2014-08-23T14:09:29.000+01:00
diff --git a/ChangeLog b/ChangeLog
@@ -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.
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -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"
 
 #======================================================================================================================

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