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!: update gentx val pub key input parsing (backport #9827) #9833

Merged
merged 2 commits into from
Aug 2, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 2, 2021

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

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

You are currently cherry-picking commit cbac7fc24.
  (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/genutil/client/cli/gentx.go
	modified:   x/genutil/client/cli/init_test.go
	modified:   x/genutil/client/testutil/suite.go
	modified:   x/staking/client/cli/flags.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.io/

(cherry picked from commit cbac7fc)

# Conflicts:
#	CHANGELOG.md
@orijbot
Copy link

orijbot commented Aug 2, 2021

Visit https://dashboard.github.orijtech.com?pr=9833&repo=cosmos%2Fcosmos-sdk to see benchmark details.

@alexanderbez alexanderbez merged commit 6137324 into release/v0.43.x Aug 2, 2021
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.43.x/pr-9827 branch August 2, 2021 21:22
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Oct 12, 2021
evan-forbes pushed a commit to evan-forbes/cosmos-sdk that referenced this pull request Nov 1, 2021
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
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.

3 participants