Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: CollateralValue and LiquidationLimit queries (backport #658) #659

Merged
merged 2 commits into from
Mar 17, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 17, 2022

This is an automatic backport of pull request #658 done by Mergify.
Cherry-pick of 8b9ec35 has failed:

On branch mergify/bp/release/v0.8.x/pr-658
Your branch is up to date with 'origin/release/v0.8.x'.

You are currently cherry-picking commit 8b9ec35.
  (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:   proto/umee/leverage/v1beta1/query.proto
	modified:   x/leverage/client/cli/query.go
	modified:   x/leverage/keeper/grpc_query.go
	modified:   x/leverage/spec/03_queries.md
	modified:   x/leverage/types/query.pb.go
	modified:   x/leverage/types/query.pb.gw.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/leverage/client/tests/suite.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 8b9ec35)

# Conflicts:
#	x/leverage/client/tests/suite.go
@alexanderbez alexanderbez merged commit 04873df into release/v0.8.x Mar 17, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.8.x/pr-658 branch March 17, 2022 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants