10000 Move cluster slots update to separate thread (bp #11523) by mergify[bot] · Pull Request #11557 · solana-labs/solana · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Move cluster slots update to separate thread (bp #11523) #11557

Merged
merged 2 commits into from
Aug 11, 2020
Merged

Move cluster slots update to separate thread (bp #11523) #11557

merged 2 commits into from
Aug 11, 2020

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Aug 11, 2020

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

Cherry-pick of 7ef50a9 has failed:

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

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

Changes to be committed:

	new file:   core/src/cluster_slots_service.rs
	modified:   core/src/lib.rs

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

	both modified:   core/src/repair_service.rs
	both modified:   core/src/retransmit_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 simulator.

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

@carllin
Move cluster slots update to separate thread (#11523)
2cd87a2 
* Add cluster_slots_service

Co-authored-by: Carl <carl@solana.com>
(cherry picked from commit 7ef50a9)

# Conflicts:
#	core/src/repair_service.rs
#	core/src/retransmit_stage.rs
@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 Aug 11, 2020
@mergify
Copy link
Contributor Author
mergify bot commented Aug 11, 2020

automerge label removed due to a CI failure

@carllin carllin force-pushed the mergify/bp/v1.2/pr-11523 branch from 3b48baa to d050852 Compare August 11, 2020 21:32
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2020
@codecov
Copy link
codecov bot commented Aug 11, 2020

Codecov Report

Merging #11557 into v1.2 will decrease coverage by 0.0%.
The diff coverage is 90.1%.

@@           Coverage Diff            @@
##            v1.2   #11557     +/-   ##
========================================
- Coverage   81.9%    81.9%   -0.1%     
========================================
  Files        319      320      +1     
  Lines      76084    76126     +42     
========================================
+ Hits       62361    62392     +31     
- Misses     13723    13734     +11

@mergify mergify bot merged commit 3124a88 into v1.2 Aug 11, 2020
@mergify mergify bot deleted the mergify/bp/v1.2/pr-11523 branch August 11, 2020 22:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@carllin
0