[2016.3] Merge forward from 2015.8 to 2016.3 #34679
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
It seems in some situations, or in some earlier version, using a `/` to reference sls files in subdirectories did work. However, because of the inconsistency it caused occasional confusion. This updates the tutorial to focus on the canonical `.` notation, which always works.
Network state integration test test=True
Check that mysqladmin exists before running mysql integration tests
* Better error handling for __virtual__ in dockerng module * Modify lodaer global test to use populated dunders This prevents a number of errors in the error log and makes for a more robust test IMHO * Lint saltstack#34644
Clarifies the proper way to reference states
This reverts commit f45dbe8.
Revert "Modify lodaer global test to use populated dunders"
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.