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

Skip leader slots until a vote lands (bp #15607) #16147

Merged
merged 1 commit into from
Mar 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 26, 2021

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

Cherry-pick of b99ae8f has failed:

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

You are currently cherry-picking commit b99ae8f33.
  (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:   core/src/test_validator.rs
	modified:   core/src/tvu.rs
	modified:   core/src/validator.rs
	modified:   local-cluster/src/validator_configs.rs
	modified:   multinode-demo/bootstrap-validator.sh
	modified:   run.sh
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/consensus.rs
	both modified:   core/src/replay_stage.rs

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 conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Mar 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Mar 26, 2021

automerge label removed due to a CI failure

@sakridge sakridge force-pushed the mergify/bp/v1.6/pr-15607 branch from 2119e5e to 4e26266 Compare March 26, 2021 17:42
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Mar 26, 2021
@codecov
Copy link

codecov bot commented Mar 26, 2021

Codecov Report

Merging #16147 (4e26266) into v1.6 (8f852d8) will decrease coverage by 0.0%.
The diff coverage is 72.0%.

@@            Coverage Diff            @@
##             v1.6   #16147     +/-   ##
=========================================
- Coverage    79.9%    79.9%   -0.1%     
=========================================
  Files         409      409             
  Lines      107665   107697     +32     
=========================================
- Hits        86078    86058     -20     
- Misses      21587    21639     +52     

@mergify mergify bot merged commit d940c5b into v1.6 Mar 26, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-15607 branch March 26, 2021 19:07
@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