Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

verify_pubkey() now takes a ref (backport #16719) #16725

Merged
merged 1 commit into from
Apr 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 21, 2021

This is an automatic backport of pull request #16719 done by Mergify.

Cherry-pick of 91b6888 has failed:

On branch mergify/bp/v1.6/pr-16719
Your branch is up to date with 'origin/v1.6'.

You are currently cherry-picking commit 91b6888e1.
  (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:   core/src/rpc.rs

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

To fixup this pull request, you can check out it 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/

@mergify mergify bot added the conflicts label Apr 21, 2021
(cherry picked from commit 91b6888)
@mvines mvines force-pushed the mergify/bp/v1.6/pr-16719 branch from 8d30161 to 5359ac1 Compare April 21, 2021 21:50
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 21, 2021
@codecov
Copy link

codecov bot commented Apr 21, 2021

Codecov Report

Merging #16725 (5359ac1) into v1.6 (ae605f8) will decrease coverage by 0.0%.
The diff coverage is 66.6%.

@@            Coverage Diff            @@
##             v1.6   #16725     +/-   ##
=========================================
- Coverage    82.9%    82.9%   -0.1%     
=========================================
  Files         414      414             
  Lines      113951   113953      +2     
=========================================
- Hits        94511    94506      -5     
- Misses      19440    19447      +7     

@mergify mergify bot merged commit e51d7af into v1.6 Apr 21, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16719 branch April 21, 2021 23:22
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant