Closed mergify[bot] closed 1 month ago
Cherry-pick of 59f7256cacceca28f90955febb5a9bd5f2f75447 has failed:
On branch mergify/bp/release/v0.49.x/pr-1396
Your branch is up to date with 'origin/release/v0.49.x'.
You are currently cherry-picking commit 59f7256ca.
(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: CHANGELOG.md
modified: docs/core/proto-docs.md
modified: proto/lbm/fswap/v1/query.proto
modified: x/fswap/types/query.pb.go
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: client/docs/swagger-ui/swagger.yaml
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.04%. Comparing base (
de3499f
) to head (9d64c30
).:exclamation: Current head 9d64c30 differs from pull request most recent head c104fb3
Please upload reports for the commit c104fb3 to get more accurate results.
All modified and coverable lines are covered by tests :white_check_mark:
Project coverage is 69.04%. Comparing base (
de3499f
) to head (c104fb3
).
Description
closes: #XXXX
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 #1396 done by Mergify.