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(api): add consensus bech32 prefix in app config (backport #16945) #16964

Merged
merged 2 commits into from
Jul 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 12, 2023

This is an automatic backport of pull request #16945 done by Mergify.
Cherry-pick of 74c351e has failed:

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

You are currently cherry-picking commit 74c351e2f.
  (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:   api/cosmos/slashing/v1beta1/query.pulsar.go
	modified:   api/cosmos/staking/module/v1/module.pulsar.go
	modified:   proto/cosmos/slashing/v1beta1/query.proto
	modified:   proto/cosmos/staking/module/v1/module.proto
	modified:   x/slashing/types/query.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/tx/signing/aminojson/internal/buf.lock

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 74c351e)

# Conflicts:
#	x/tx/signing/aminojson/internal/buf.lock
@github-actions
Copy link
Contributor

@mergify[bot] your pull request is missing a changelog!

@julienrbrt julienrbrt enabled auto-merge (squash) July 12, 2023 20:18
@julienrbrt julienrbrt merged commit 5567e86 into release/v0.50.x Jul 12, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16945 branch July 12, 2023 22:08
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
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