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: import hex keys (backport #17424) #17433

Merged
merged 3 commits into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 17, 2023

This is an automatic backport of pull request #17424 done by Mergify.
Cherry-pick of 0e05785 has failed:

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

You are currently cherry-picking commit 0e057851c.
  (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/import.go
	modified:   client/keys/import_test.go
	modified:   client/keys/root.go
	modified:   client/keys/root_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   crypto/keyring/keyring.go
	both modified:   crypto/keyring/keyring_test.go

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 0e05785)

# Conflicts:
#	CHANGELOG.md
#	crypto/keyring/keyring.go
#	crypto/keyring/keyring_test.go
@mergify mergify bot requested a review from a team as a code owner August 17, 2023 15:57
@mergify mergify bot added the conflicts label Aug 17, 2023
@github-actions github-actions bot added C:CLI C:Keys Keybase, KMS and HSMs labels Aug 17, 2023
@julienrbrt julienrbrt self-assigned this Aug 17, 2023
@julienrbrt julienrbrt removed their assignment Aug 17, 2023
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

tACK

@julienrbrt julienrbrt enabled auto-merge (squash) August 17, 2023 16:06
@julienrbrt julienrbrt enabled auto-merge (squash) August 17, 2023 16:25
@julienrbrt julienrbrt merged commit 612f0fe into release/v0.47.x Aug 17, 2023
23 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-17424 branch August 17, 2023 16:44
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
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

2 participants