Merge branch 'develop' into stable

saltstack · Feb 27, 2015 · 1a36092 · 1a36092
2 parents 81514c5 + 47cdbb5
commit 1a36092
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,4 @@
-Version 2015.02.15:
+Version 2015.02.27:
 	* Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van 
 	Zantvoort(The-Loeki)
 	* No need to install packages from the Unstable repository for debian, use backports. Thanks 

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="2015.02.15"
+__ScriptVersion="2015.02.27"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================