[2016.3] Merge forward from 2015.8 to 2016.3 #34281
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
Previously time values could not be set to zero and would simply leave the previous time value when attempting to set the time.
ipset: fix commont containing blank
…tetime Fix win_system.set_system_date_time
This change makes it possible for --config-dir to work from the CLI. Fixes saltstack#34037
No conflicts.
[2015.8] Merge forward from 2015.5 to 2015.8
Don't escape source before calling managed
Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
ipset: fix the comment containing blank
Conflicts: - salt/renderers/gpg.py - tests/unit/renderers/gpg_test.py
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.
Conflicts: