Skip to content

Allow blocksync to not verify all signatures (backport #1858)#1872

Merged
sergio-mena merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-1858
Dec 20, 2023
Merged

Allow blocksync to not verify all signatures (backport #1858)#1872
sergio-mena merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-1858

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 20, 2023

This is an automatic backport of pull request #1858 done by Mergify.
Cherry-pick of 9446e31 has failed:

On branch mergify/bp/v0.34.x/pr-1858
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 9446e3135.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/blocksync/reactor.go

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

* Blocksync can skip sigs

* bump

(cherry picked from commit 9446e31)

# Conflicts:
#	internal/blocksync/reactor.go
@mergify mergify bot requested a review from a team as a code owner December 20, 2023 07:28
@mergify mergify bot added the conflicts label Dec 20, 2023
@sergio-mena sergio-mena self-assigned this Dec 20, 2023
@sergio-mena sergio-mena merged commit c77707b into v0.34.x Dec 20, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.34.x/pr-1858 branch December 20, 2023 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

1 participant