[2015.8] Merge forward from 2015.5 to 2015.8 #27234
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
Back-port saltstack#27150 to 2015.5
A no-op state that does nothing. Useful in conjunction with the `use` requisite, or in templates which could otherwise be empty due to jinja rendering Unlike test.succeed_without_changes, takes **kwargs to be more flexible. Also removed the test stuff from succeed_without_changes. If a state doesn't make changes, its behavior should be identical whether in test mode or not.
Correctly support https, port 443 is not a requirement
rename hash_hostname to hash_known_hosts
[2015.5] Add test.nop state
[2015.5] Add stub release notes for 2015.5.6
Conflicts:
salt/utils/http.py
|
Go Go Jenkins! |
jfindlay
added a commit
that referenced
this pull request
Sep 18, 2015
[2015.8] Merge forward from 2015.5 to 2015.8
Closed
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.
[2015.8] Merge forward from 2015.5 to 2015.8