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: add params migration (backport #14992) #15004

Merged
merged 5 commits into from
Feb 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 13, 2023

This is an automatic backport of pull request #14992 done by Mergify.
Cherry-pick of 0f99829 has failed:

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

You are currently cherry-picking commit 0f99829fa.
  (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/migrations/v4/migrate.go
	renamed:    x/auth/migrations/v4/migrator_test.go -> x/auth/migrations/v4/migrate_test.go
	modified:   x/auth/types/params.go
	modified:   x/auth/types/params_legacy.go
	modified:   x/crisis/types/legacy_params.go
	modified:   x/distribution/types/params_legacy.go
	modified:   x/gov/types/v1/params_legacy.go
	modified:   x/mint/types/params_legacy.go
	modified:   x/params/types/subspace.go
	modified:   x/slashing/types/params_legacy.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   UPGRADING.md
	both modified:   simapp/app.go
	both modified:   simapp/upgrades.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 0f99829)

# Conflicts:
#	UPGRADING.md
#	simapp/app.go
#	simapp/upgrades.go
Copy link
Contributor

@likhita-809 likhita-809 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you resolve the conflicts @julienrbrt

@julienrbrt julienrbrt self-assigned this Feb 13, 2023
@julienrbrt julienrbrt removed their assignment Feb 13, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK from this branch too.

@julienrbrt julienrbrt enabled auto-merge (squash) February 13, 2023 17:47
@julienrbrt julienrbrt merged commit 54cf870 into release/v0.47.x Feb 13, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-14992 branch February 13, 2023 21:19
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