Merge branch 'develop' into stable for v2015.11.09 release

saltstack · Nov 9, 2015 · e5e5f9f · e5e5f9f
2 parents 29fc62f + 9a161c8
commit e5e5f9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Version 2015.11.09
+	* Make sure that wget is installed. #868
+
+
 Version 2015.11.04:
 	* Allow bypassing dependencies installation. Thanks EYJ. #656.
 	* Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). #653

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.11.04"
+__ScriptVersion="2015.11.09"
 __ScriptName="bootstrap-salt.sh"
 
 #======================================================================================================================
@@ -1881,6 +1881,10 @@ install_ubuntu_stable_deps() {
                 /etc/apt/sources.list.d/saltstack.list
         fi
 
+
+        # Make sure wget is available
+        __apt_get_install_noinput wget
+
         # shellcheck disable=SC2086
         wget $_WGET_ARGS -q http://repo.saltstack.com/apt/ubuntu/ubuntu$DISTRO_MAJOR_VERSION/$STABLE_REV/SALTSTACK-GPG-KEY.pub -O - | apt-key add - || return 1