[2016.3] Merge forward from 2015.8 to 2016.3 #34404
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…34377) * Remove redundant usage of destructiveTest decorator * Remove unnecessary SLS file This simple state can be run using run_state * Explicitly order tests * Use run_state instead of invoking state.sls * Ensure only one refresh_db done during pkg integration tests * Add pkg.latest test for package without an epoch * Optimize pkg.latest_version usage in pkg integration tests * Clarify outcome when only_upgrade is used * Add pkg.latest test with only_upgrade=True
…on_test Network state integration test
Clarify that salt-cloud doesn't get installed by bootstrap
No conflicts.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No conflicts.