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

Don't stop to find newer cluster-confirmed roots (bp #14557)#14559

Merged
mergify[bot] merged 3 commits intov1.4from
mergify/bp/v1.4/pr-14557
Jan 14, 2021
Merged

Don't stop to find newer cluster-confirmed roots (bp #14557)#14559
mergify[bot] merged 3 commits intov1.4from
mergify/bp/v1.4/pr-14557

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 13, 2021

This is an automated backport of pull request #14557 done by Mergify

Cherry-pick of e95ebcf has failed:

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

You are currently cherry-picking commit e95ebcf86.
  (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:   ledger/src/blockstore_processor.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/

* Don't stop to find newer cluster-confirmed roots

* Fix and add new tests

* nits

(cherry picked from commit e95ebcf)

# Conflicts:
#	ledger/src/blockstore_processor.rs
@mergify mergify Bot added the conflicts label Jan 13, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 13, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2021
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 13, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 14, 2021

Codecov Report

Merging #14559 (bec236f) into v1.4 (3d75623) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff           @@
##            v1.4   #14559   +/-   ##
======================================
  Coverage   82.5%    82.6%           
======================================
  Files        387      387           
  Lines      99437    99460   +23     
======================================
+ Hits       82134    82179   +45     
+ Misses     17303    17281   -22     

@mergify mergify Bot merged commit e822f8c into v1.4 Jan 14, 2021
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-14557 branch January 14, 2021 01:17
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