Merge branch 'develop' into stable

saltstack · Mar 4, 2015 · fe14312 · fe14312
2 parents 103bb7d + c3ee244
commit fe14312
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Version 2015.03.04:
+	* Fix the salt package selection on Arch stable installs.
+
 Version 2015.02.28:
 	* Fix Debian backports repository.
 

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.28"
+__ScriptVersion="2015.03.04"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================
@@ -3421,7 +3421,7 @@ install_arch_linux_stable() {
     pacman -S --noconfirm --needed bash || return 1
     pacman -Su --noconfirm || return 1
     # We can now resume regular salt update
-    pacman -Syu --noconfirm salt || return 1
+    pacman -Syu --noconfirm salt-zmq || return 1
     return 0
 }