[Backport master] Use Ubuntu 20.04 #800
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
sbrunner
force-pushed
the
backport/757-to-master
branch
from
2862caf
to
c8fc2a1
Compare
sbrunner
approved these changes
Nov 13, 2020
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.
Backport of camptocamp/c2cwsgiutils#757
Error on cherry picking:
Error on backporting to branch master, error on cherry picking f0b7083ab4c420602fc49399a4af416f9bf2174d:
To continue do:
git fetch && git checkout backport/757-to-master && git reset --mixed HEAD^
rm BACKPORT_TODO
git apply --3way --index f0b7083ab4c420602fc49399a4af416f9bf2174d.patch
rm f0b7083ab4c420602fc49399a4af416f9bf2174d.patch
git commit --message="Use Ubuntu 20.04"
git push origin backport/757-to-master --force