[Backport 3.26] Use c2cciutils #1631
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/1616-to-3.26
branch
from
64bc8b8
to
9cb9e41
Compare
sbrunner
force-pushed
the
backport/1616-to-3.26
branch
from
9cb9e41
to
381f220
Compare
sbrunner
force-pushed
the
backport/1616-to-3.26
branch
from
381f220
to
b261051
Compare
sbrunner
approved these changes
Dec 16, 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 #1616
Error on cherry picking:
Error on backporting to branch 3.26, error on cherry picking 7149d74:
To continue do:
git fetch && git checkout backport/1616-to-3.26 && git reset --hard HEAD^
git cherry-pick 7149d74
git push origin backport/1616-to-3.26 --force