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.8] Merge forward from 2015.5 to 2015.8 #34451

Merged
merged 3 commits into from
Jul 5, 2016
Merged

[2015.8] Merge forward from 2015.5 to 2015.8 #34451

merged 3 commits into from
Jul 5, 2016

Commits on Jul 1, 2016

  1. Backport change to integraiton test suite 

    Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
    Mike Place committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    0e2c71a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2016

  1. Merge pull request saltstack#34435 from cachedout/backport_config_dir… 

    …_integration

Backport change to integraiton test suite
    Mike Place authored Jul 5, 2016
    Configuration menu
    Copy the full SHA
    8c72ee5 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2015.5' into '2015.8' 

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