Pulling in upstream changes #11436
Merged
Pulling in upstream changes #11436
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
- add the appropriate release branch to the branches list - add a fallback to the `docker pull` command
* Correct syntax errors & add back lost last line for messages.po * Manually sort through es & nl translated strings * Mnaually sort through french strings and correct syntax errors Signed-off-by: Christian M. Adams <[email protected]>
AlanCoding
reviewed
Dec 8, 2021
| self.task.instance.save(update_fields=['result_traceback']) | ||
|
|
||
| result = namedtuple('result', ['status', 'rc']) | ||
| return result('error', 1) |
There was a problem hiding this comment.
We should either remove or revert this commit, because it was reverted downstream and git just messed it up somehow.
There was a problem hiding this comment.
do we need to revert again downstream?
There was a problem hiding this comment.
Revert the whole commit, or just this line of code?
There was a problem hiding this comment.
the whole commit 2a11bb4. Doesn't matter to me how you do the git process.
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.
SUMMARY
This is a sync of upstream with devel
#11427