Closed mergify[bot] closed 6 months ago
Cherry-pick of 9105ff4be9ae75612df62bc89944e4e310057c0b has failed:
On branch mergify/bp/release/v0.48.x/pr-1310
Your branch is up to date with 'origin/release/v0.48.x'.
You are currently cherry-picking commit 9105ff4be.
(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: store/rootmulti/store.go
modified: store/rootmulti/store_test.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: CHANGELOG.md
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 (
1f8e902
) to head (1139b35
). Report is 6 commits behind head on release/v0.48.x.:exclamation: Current head 1139b35 differs from pull request most recent head f965188. Consider uploading reports for the commit f965188 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 #1310 done by Mergify.