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!: bring back the cliff vesting command (#111) (backport #271) #272

Merged
merged 3 commits into from
Jun 23, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 23, 2022

This is an automatic backport of pull request #271 done by Mergify.
Cherry-pick of bf5b163 has failed:

On branch mergify/bp/v0.45.0x-osmo-v7/pr-271
Your branch is up to date with 'origin/v0.45.0x-osmo-v7'.

You are currently cherry-picking commit bf5b16352.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/auth/vesting/client/cli/tx.go

no changes added to commit (use "git add" and/or "git commit -a")

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

* Bring back the cliff vesting command #111

* Wrap error

(cherry picked from commit bf5b163)

# Conflicts:
#	x/auth/vesting/client/cli/tx.go
@mergify mergify bot requested a review from alexanderbez as a code owner June 23, 2022 19:29
@mergify mergify bot added the conflicts label Jun 23, 2022
@ValarDragon ValarDragon merged commit 6209434 into v0.45.0x-osmo-v7 Jun 23, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v0.45.0x-osmo-v7/pr-271 branch June 23, 2022 19:58
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.

1 participant