rallytime
9ad362fbde
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2
Change OSX/OS X to macOS where possible
2016-12-28 14:49:46 -07:00
David Cournapeau
dcc52ba08a
BUG: fix copypasta in preinstall script.
2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa
Revert "REF: use a variable to reference the pre/post install script output on OS X installer."
...
This reverts commit 7180e5ec21
2016-11-24 14:52:03 +00:00
David Cournapeau
7180e5ec21
REF: use a variable to reference the pre/post install script output on OS X installer.
2016-11-23 11:48:18 +00:00
David Cournapeau
4265da7b53
BUG: use -w option when unloading salt minion launchd script.
2016-11-23 11:39:30 +00:00
David Cournapeau
8c7a88040f
TYPO: fix typo in debug postinstall message in OSX installer.
2016-11-23 11:38:25 +00:00
David Cournapeau
0e8cf75680
FEAT: put back support for Maverick in OS X installer.
...
As launchctl CLI interface changed on Yosemite, we execute the more
recent code for Yosemite and later, and introduced back the old code for
post/pre install scripts when running on Maverick.
Tested on Maverick (10.9.5).
2016-11-23 11:34:42 +00:00
twangboy
8091a3065e
Create paths.d directory
2016-11-03 09:27:50 -06:00
Clayton Burlison
b483d1d8a6
Update mac native package for upcoming release
...
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.
Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools
to match Apple's offical documentation.
Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
2016-06-01 23:32:23 -05:00
