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 client config don't take effect (backport #9211) #9360

Merged
merged 2 commits into from
May 19, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2021

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

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

You are currently cherry-picking commit b4d1a5e5d.
  (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:   client/config/config.go
	modified:   client/keys/show.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/keys/add.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

* fix client keyring config

* fix output flag of keys commads

Co-authored-by: Robert Zaremba <[email protected]>
Co-authored-by: Amaury <[email protected]>
(cherry picked from commit b4d1a5e)

# Conflicts:
#	client/keys/add.go
@mergify mergify bot requested review from aaronc, alessio and alexanderbez as code owners May 19, 2021 08:44
@mergify mergify bot added the conflicts label May 19, 2021
@amaury1093 amaury1093 added this to the v0.42.5 milestone May 19, 2021
@lgtm-com
Copy link

lgtm-com bot commented May 19, 2021

This pull request introduces 4 alerts when merging 55e4fdc into 1327224 - view on LGTM.com

new alerts:

  • 3 for Useless assignment to local variable
  • 1 for Unreachable statement

Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

tACK.

test:

simd config keyring-backend // shows "os"
simd keys list // shows "os" backend keys
simd config keyring-backend test
simd keys list // shows "test" backend keys
simd keys add abc
simd keys list // shows "test" backend keys, incl. "abc"

@robert-zaremba robert-zaremba added the A:automerge Automatically merge PR once all prerequisites pass. label May 19, 2021
@aaronc aaronc merged commit 9fe61a7 into release/v0.42.x May 19, 2021
@aaronc aaronc deleted the mergify/bp/release/v0.42.x/pr-9211 branch May 19, 2021 14:41
faddat pushed a commit to osmosis-labs/cosmos-sdk that referenced this pull request Dec 19, 2022
* fix client config don't take effect (cosmos#9211)

* fix client keyring config

* fix output flag of keys commads

Co-authored-by: Robert Zaremba <[email protected]>
Co-authored-by: Amaury <[email protected]>
(cherry picked from commit b4d1a5e)

* Fix conflicts

Co-authored-by: yihuang <[email protected]>
Co-authored-by: Amaury M <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge Automatically merge PR once all prerequisites pass.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants