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!: Fix gov amino codec (backport #13196) #14097

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2022

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

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

You are currently cherry-picking commit d9972c4dd.
  (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:   docs/core/encoding.md
	modified:   x/auth/types/codec.go
	modified:   x/auth/vesting/types/codec.go
	modified:   x/authz/codec.go
	modified:   x/bank/types/codec.go
	modified:   x/crisis/types/codec.go
	modified:   x/evidence/types/codec.go
	modified:   x/feegrant/codec.go
	new file:   x/gov/codec/cdc.go
	new file:   x/gov/codec/doc.go
	modified:   x/gov/types/v1/codec.go
	modified:   x/gov/types/v1beta1/codec.go
	modified:   x/gov/types/v1beta1/msgs.go
	modified:   x/group/codec.go
	modified:   x/slashing/types/codec.go
	modified:   x/staking/types/codec.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/distribution/types/codec.go
	both modified:   x/gov/simulation/operations_test.go
	both modified:   x/gov/types/v1/msgs.go
	both modified:   x/gov/types/v1/msgs_test.go
	both modified:   x/mint/types/codec.go
	both modified:   x/upgrade/types/codec.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

* fix!: Fix gov amino codec

* changelog

(cherry picked from commit d9972c4)

# Conflicts:
#	CHANGELOG.md
#	x/distribution/types/codec.go
#	x/gov/simulation/operations_test.go
#	x/gov/types/v1/msgs.go
#	x/gov/types/v1/msgs_test.go
#	x/mint/types/codec.go
#	x/upgrade/types/codec.go
@julienrbrt
Copy link
Member

No backport. Fixed in 0.47.

@julienrbrt julienrbrt closed this Nov 30, 2022
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.46.x/pr-13196 branch November 30, 2022 12:35
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