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

[2016.3] Merge forward from 2015.8 to 2016.3 #34740

Merged
merged 3 commits into from
Jul 18, 2016
Merged

[2016.3] Merge forward from 2015.8 to 2016.3 #34740

merged 3 commits into from
Jul 18, 2016

Commits on Jul 16, 2016

  1. Add output_file option to master config docs 

    Fixes saltstack#34703
    rallytime committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    9c803d0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request saltstack#34721 from rallytime/fix-34703 

    Add output_file option to master config docs
    Mike Place authored Jul 16, 2016
    Configuration menu
    Copy the full SHA
    e9e5bbe View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2016

  1. Merge branch '2015.8' into '2016.3' 

    No conflicts.
    rallytime committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    7d106c7 View commit details
    Browse the repository at this point in the history