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

refactor: remove cosmos/keyring (backport #12576) #12707

Merged
merged 4 commits into from
Jul 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 25, 2022

This is an automatic backport of pull request #12576 done by Mergify.
Cherry-pick of 01b4a42 has failed:

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

You are currently cherry-picking commit 01b4a4237.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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 01b4a42)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
@mergify mergify bot requested a review from a team as a code owner July 25, 2022 11:41
@mergify mergify bot added the conflicts label Jul 25, 2022
@mergify mergify bot mentioned this pull request Jul 25, 2022
19 tasks
@tac0turtle tac0turtle merged commit 24be8ea into release/v0.46.x Jul 25, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.46.x/pr-12576 branch July 25, 2022 12:27
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
* refactor: remove cosmos/keyring (cosmos#12576)

(cherry picked from commit 01b4a42)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum

* resolve conflicts

* revert extra change

* minor cleanup

Co-authored-by: Rootul Patel <rootulp@gmail.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
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.

4 participants