Fix broken state orchestration #29122
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
This corrects an issue introduced in saltstack#28012 wherein the `m_ret` variable was not set prior to evaluation. Here, we simply set it to None and then check for this type explicitely. Fixes saltstack#29110
rallytime
pushed a commit
that referenced
this pull request
Nov 23, 2015
Fix broken state orchestration
cachedout
pushed a commit
to cachedout/salt
that referenced
this pull request
Nov 23, 2015
Tweak fix in saltstack#29122 after review with @basepi
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.
This corrects an issue introduced in #28012 wherein the
m_retvariablewas not set prior to evaluation. Here, we simply set it to None and then check for this type explicitely.
Fixes #29110