-
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
Port #52241 to master #56440
Merged
Merged
Port #52241 to master #56440
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
s0undt3ch
previously approved these changes
Apr 21, 2020
We now have conflicts that need to be solved, likely black related. |
* salt/runner.py::_run_runner was always returning {retcode: 70}. removed the else logic * fixed some tests
dwoz
approved these changes
May 6, 2020
s0undt3ch
added a commit
to s0undt3ch/salt
that referenced
this pull request
May 14, 2020
This change was merged into master in saltstack#56440 which was a port to master effort from saltstack#52241 Fixes saltstack#57278
I do not believe it will work as intended, because the prerequisite PR was not backported to develop from old Neon: #51629 |
3 tasks
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.
Port #52241 to master. It was previously on the devleop branch waiting to be merged in.