saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2016.11.8' into '2016.11'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2017-09-18 16:40:05 -04:00
commit 57b9d642c2
2 changed files with 1720 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1719
doc/topics/releases/2016.11.8.rst Normal file
View file

File diff suppressed because it is too large Load diff

2
pkg/osx/pkg-scripts/preinstall
View file

@ -129,7 +129,7 @@ fi
###############################################################################
# Remove the salt from the paths.d
###############################################################################
if [ ! -f "/etc/paths.d/salt" ]; then
if [ -f "/etc/paths.d/salt" ]; then
echo "Path: Removing salt from the path..." >> "$TEMP_DIR/preinstall.txt"
rm "/etc/paths.d/salt"
echo "Path: Removed Successfully" >> "$TEMP_DIR/preinstall.txt"