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: keyring-backend flag usage (backport #14509) #14516

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2023

This is an automatic backport of pull request #14509 done by Mergify.
Cherry-pick of 3e2dde5 has failed:

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

You are currently cherry-picking commit 3e2dde54c.
  (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/keys/root.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/flags/flags.go
	deleted by us:   docs/docs/run-node/00-keyring.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.com

(cherry picked from commit 3e2dde5)

# Conflicts:
#	CHANGELOG.md
#	client/flags/flags.go
#	docs/docs/run-node/00-keyring.md
@mergify mergify bot requested a review from a team as a code owner January 5, 2023 20:53
@mergify mergify bot added the conflicts label Jan 5, 2023
@github-actions github-actions bot added C:CLI C:Keys Keybase, KMS and HSMs labels Jan 5, 2023
@julienrbrt julienrbrt closed this Jan 5, 2023
@mergify mergify bot deleted the mergify/bp/release/v0.46.x/pr-14509 branch January 5, 2023 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:Keys Keybase, KMS and HSMs conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants