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

ClusterInfoVoteListener send only missing votes to BankingStage (backport #20873)#22135

Merged
mergify[bot] merged 4 commits intov1.8from
mergify/bp/v1.8/pr-20873
Dec 30, 2021
Merged

ClusterInfoVoteListener send only missing votes to BankingStage (backport #20873)#22135
mergify[bot] merged 4 commits intov1.8from
mergify/bp/v1.8/pr-20873

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 28, 2021

This is an automatic backport of pull request #20873 done by Mergify.
Cherry-pick of b30c94c has failed:

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

You are currently cherry-picking commit b30c94ce5.
  (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:   ci/buildkite-pipeline.sh
	modified:   core/src/replay_stage.rs
	modified:   gossip/tests/gossip.rs
	modified:   sdk/program/src/slot_hashes.rs
	modified:   sdk/src/signature.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/cluster_info_vote_listener.rs
	both modified:   core/src/verified_vote_packets.rs
	both modified:   gossip/src/cluster_info.rs
	both modified:   local-cluster/tests/local_cluster.rs
	both modified:   runtime/src/bank.rs

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

@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 28, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-20873 branch from 4de80d9 to 0ad5e61 Compare December 28, 2021 22:49
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 28, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 28, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@carllin carllin force-pushed the mergify/bp/v1.8/pr-20873 branch from 2928264 to 41591e6 Compare December 29, 2021 05:23
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 29, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 29, 2021

automerge label removed due to a CI failure

(cherry picked from commit b30c94c)

# Conflicts:
#	core/src/cluster_info_vote_listener.rs
#	core/src/verified_vote_packets.rs
#	gossip/src/cluster_info.rs
#	local-cluster/tests/local_cluster.rs
#	runtime/src/bank.rs
@carllin carllin force-pushed the mergify/bp/v1.8/pr-20873 branch from 41591e6 to b6737e2 Compare December 30, 2021 01:10
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 30, 2021
@mergify mergify Bot merged commit 3b89510 into v1.8 Dec 30, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 30, 2021

Codecov Report

Merging #22135 (b6737e2) into v1.8 (24b0fc8) will increase coverage by 0.0%.
The diff coverage is 96.3%.

@@           Coverage Diff            @@
##             v1.8   #22135    +/-   ##
========================================
  Coverage    81.5%    81.5%            
========================================
  Files         459      459            
  Lines      130699   130906   +207     
========================================
+ Hits       106584   106819   +235     
+ Misses      24115    24087    -28     

@mergify mergify Bot deleted the mergify/bp/v1.8/pr-20873 branch December 30, 2021 06:38
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 3, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant