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

Add VoteTracker for tracking cluster's votes in gossip (bp #8327)#8753

Closed
mergify[bot] wants to merge 1 commit intov1.0from
mergify/bp/v1.0/pr-8327
Closed

Add VoteTracker for tracking cluster's votes in gossip (bp #8327)#8753
mergify[bot] wants to merge 1 commit intov1.0from
mergify/bp/v1.0/pr-8327

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Mar 10, 2020

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

Cherry-pick of 9872430 has failed:

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

You are currently cherry-picking commit 9872430bd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   core/src/cluster_info_vote_listener.rs
	modified:   core/src/replay_stage.rs
	modified:   core/src/tpu.rs
	modified:   core/src/tvu.rs
	modified:   core/src/validator.rs
	modified:   ledger/src/bank_forks.rs
	modified:   sdk/src/message.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   runtime/src/message_processor.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
  • @Mergifyio backports <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 simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Mar 10, 2020
@solana-grimes
Copy link
Copy Markdown
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Mar 10, 2020
Track votes by slot in cluster_vote_listener

(cherry picked from commit 9872430)
@carllin carllin force-pushed the mergify/bp/v1.0/pr-8327 branch from 69a03f9 to 4976174 Compare March 11, 2020 20:14
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Mar 11, 2020
@carllin carllin removed automerge Merge this Pull Request automatically once CI passes conflicts labels Mar 11, 2020
@carllin carllin closed this Mar 11, 2020
@mergify mergify Bot deleted the mergify/bp/v1.0/pr-8327 branch March 11, 2020 20:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants