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

Fix tower/blockstore unsync due to external causes (bp #12671)#13310

Merged
mergify[bot] merged 1 commit intov1.4from
mergify/bp/v1.4/pr-12671
Oct 30, 2020
Merged

Fix tower/blockstore unsync due to external causes (bp #12671)#13310
mergify[bot] merged 1 commit intov1.4from
mergify/bp/v1.4/pr-12671

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 30, 2020

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

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/

* Fix tower/blockstore unsync due to external causes

* Add and clean up long comments

* Clean up test

* Comment about warped_slot_history

* Run test_future_tower with master-only/master-slave

* Update comments about false leader condition

(cherry picked from commit 1df15d8)
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Oct 30, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Oct 30, 2020

Codecov Report

Merging #13310 into v1.4 will decrease coverage by 0.0%.
The diff coverage is 71.1%.

@@           Coverage Diff            @@
##            v1.4   #13310     +/-   ##
========================================
- Coverage   82.2%    82.2%   -0.1%     
========================================
  Files        374      374             
  Lines      87171    87205     +34     
========================================
+ Hits       71669    71695     +26     
- Misses     15502    15510      +8     

@mergify mergify Bot merged commit 1281483 into v1.4 Oct 30, 2020
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-12671 branch October 30, 2020 11:47
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant