Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2015.5] Merge forward from 2014.7 to 2015.5 #24935

Merged
merged 3 commits into from
Jun 24, 2015
Merged

[2015.5] Merge forward from 2014.7 to 2015.5 #24935

merged 3 commits into from
Jun 24, 2015

Commits on Jun 24, 2015

  1. Smartos smf minion fix 

    Per my own testing on dozens of SmartOS VM's and issue saltstack#473 "Problem
3", the salt-minion service manifest definition doesn't work. This
change fixes that. I think it may have broke in 2014.7 so back porting
to that ver.
    @BretFisher
    BretFisher committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    d7bfb0c View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#24918 from BretFisher/minion-start-smart… 

    …os-smf-fix

SmartOS SMF minion startup fix
    @jfindlay
    jfindlay committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    eeb05a1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5

    @basepi
    basepi committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    8d8bf34 View commit details
    Browse the repository at this point in the history