Skip to content

Commit e5e5f9f

Browse files
committed
Merge branch 'develop' into stable for v2015.11.09 release
2 parents 29fc62f + 9a161c8 commit e5e5f9f

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Version 2015.11.09
2+
* Make sure that wget is installed. #868
3+
4+
15
Version 2015.11.04:
26
* Allow bypassing dependencies installation. Thanks EYJ. #656.
37
* Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). #653

bootstrap-salt.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# CREATED: 10/15/2012 09:49:37 PM WEST
1818
#======================================================================================================================
1919
set -o nounset # Treat unset variables as an error
20-
__ScriptVersion="2015.11.04"
20+
__ScriptVersion="2015.11.09"
2121
__ScriptName="bootstrap-salt.sh"
2222

2323
#======================================================================================================================
@@ -1881,6 +1881,10 @@ install_ubuntu_stable_deps() {
18811881
/etc/apt/sources.list.d/saltstack.list
18821882
fi
18831883

1884+
1885+
# Make sure wget is available
1886+
__apt_get_install_noinput wget
1887+
18841888
# shellcheck disable=SC2086
18851889
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
18861890

0 commit comments

Comments
 (0)