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: add vesting util functions (backport #11652) #11666

Merged
merged 2 commits into from
Apr 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 17, 2022

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

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

You are currently cherry-picking commit c67695227.
  (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:   x/auth/vesting/types/period.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/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

* feat: add vesting util functions

* changelog

* revert string deletion

* fix build

* Update x/auth/vesting/types/period.go

Co-authored-by: Aleksandr Bezobchuk <[email protected]>

Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Marko <[email protected]>
(cherry picked from commit c676952)

# Conflicts:
#	CHANGELOG.md
CHANGELOG.md Outdated Show resolved Hide resolved
@fedekunze fedekunze added A:automerge Automatically merge PR once all prerequisites pass. and removed conflicts labels Apr 17, 2022
@tac0turtle tac0turtle merged commit 4f2453b into release/v0.46.x Apr 18, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.46.x/pr-11652 branch April 18, 2022 09:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass. C:x/auth
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants