-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[2018.3] Merge forward from 2018.3.2 to 2018.3 #48354
Merged
rallytime
merged 20 commits into
saltstack:2018.3
from
rallytime:merge-2018.3.2-to-2018.3
Jun 28, 2018
Merged
[2018.3] Merge forward from 2018.3.2 to 2018.3 #48354
rallytime
merged 20 commits into
saltstack:2018.3
from
rallytime:merge-2018.3.2-to-2018.3
Jun 28, 2018
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
…n. Fixes an issue when minions are pointed at multiple syndics.
…, renaming to in line with the functions in the state module. Including aliases to previous names for back-ward compatibility. Including a soft_kill function to kill running orchestration states. A new test to test soft_kill functionality.
…uld throw a stacktrace.
Back-port saltstack#48075 to 2018.3.2
Back-port saltstack#47915 to 2018.3.2
Back-port saltstack#48014 to 2018.3.2
Add release notes for 2018.3.2
[2018.3.2] bootstrap kitchen branch tests with 2017.7.6
Update man pages for 2018.3.2
always listen when gathering job info
Update release notes for 2018.3.2
Conflicts: - tests/integration/runners/test_state.py
gtmanfred
approved these changes
Jun 28, 2018
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: