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

fix(gov): Fix v3 votes migrations (backport #14214) #14276

Merged
merged 3 commits into from Dec 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2022

This is an automatic backport of pull request #14214 done by Mergify.
Cherry-pick of 1bd9cbe has failed:

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

You are currently cherry-picking commit 1bd9cbe9e.
  (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/gov/migrations/v3/json_test.go
	modified:   x/gov/migrations/v3/store.go
	modified:   x/gov/migrations/v3/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/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

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit 1bd9cbe)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner December 13, 2022 09:24
@mergify mergify bot added the conflicts label Dec 13, 2022
@amaury1093 amaury1093 enabled auto-merge (squash) December 13, 2022 09:40
@amaury1093 amaury1093 merged commit 9552603 into release/v0.47.x Dec 13, 2022
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.47.x/pr-14214 branch December 13, 2022 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants