[develop] Merge forward from 2016.3 to develop #34894
Closed
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#25276 to 2015.8
Back-port saltstack#28521 to 2015.8
fix beacon list to include all beacons being processed
Add an option to skip the verification of client_acl users
We have already import salt.ext.six above - no need to do it twice
Fix salt-ssh state.high and state.low
Conflicts: - - - - - - - - - conf/master
Fix random ordering bug
Fix wheel test
[2016.3] Merge forward from 2015.8 to 2016.3
But it does fix all other distros....
saltstack#34869) * Add git.diff function * Fail git.latest states with uncommitted changes when force_reset=False Also, discard these changes when running the state if force_reset=True. * Add integration test for case where there are uncommitted changes
No conflicts.
This needs discussion, since this breaks SUSE
Remove string_types import from state compiler
…hen-needed Try to create the log directory when not present yet
[2016.3] Merge forward from 2015.8 to 2016.3
Conflicts: - salt/state.py - tests/integration/wheel/key.py
|
It appears the beacon test failures are related. Though I am not sure why because they're passing (without any changes) in earlier branches. I'll look at this more closely next week. |
|
Will do a new one instead. |
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: