Closed mergify[bot] closed 4 months ago
Cherry-pick of e62a33006bbe19f12309be75a2771c6623eea155 has failed:
On branch mergify/bp/release/v0.48.x/pr-1316
Your branch is up to date with 'origin/release/v0.48.x'.
You are currently cherry-picking commit e62a33006.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: crypto/keyring/keyring_ledger_test.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: CHANGELOG.md
both modified: crypto/keyring/keyring.go
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 69.78%. Comparing base (
a14fa3e
) to head (a14fa3e
).:exclamation: Current head a14fa3e differs from pull request most recent head 4a511d7. Consider uploading reports for the commit 4a511d7 to get more accurate results
Description
Motivation and context
How has this been tested?
Screenshots (if appropriate):
Checklist:
CHANGELOG.md
client/docs/swagger-ui/swagger.yaml
This is an automatic backport of pull request #1316 done by Mergify.