[Backport 2.4] Localize query result in API #5979
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/5974-to-2.4
branch
from
1417842 to
520b255
Compare
|
This pull request introduces 1 alert when merging 520b255 into 0ce48ee - view on LGTM.com new alerts:
|
sbrunner
approved these changes
Jun 30, 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 #5974
Error on cherry picking:
Error on backporting to branch 2.4, error on cherry picking ['f06587e643bf3f755c23c676f6f1cab3b63078f1']:
error: could not apply f06587e... Localize query result in API
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add ' or 'git rm '
hint: and commit the result with 'git commit'
To continue do:
git fetch
git checkout backport/5974-to-2.4
git reset --hard HEAD^
git cherry-pick f06587e
git push origin backport/5974-to-2.4 --force