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

Rename Packets to PacketBatch (backport #21794)#21804

Merged
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21794
Dec 11, 2021
Merged

Rename Packets to PacketBatch (backport #21794)#21804
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21794

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 11, 2021

This is an automatic backport of pull request #21794 done by Mergify.
Cherry-pick of 254ef3e has failed:

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

You are currently cherry-picking commit 254ef3e7b.
  (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:   banking-bench/src/main.rs
	modified:   bench-streamer/src/main.rs
	modified:   core/benches/banking_stage.rs
	modified:   core/benches/sigverify_stage.rs
	modified:   core/src/retransmit_stage.rs
	modified:   core/src/sigverify.rs
	modified:   core/src/sigverify_shreds.rs
	modified:   ledger/benches/sigverify_shreds.rs
	modified:   ledger/src/sigverify_shreds.rs
	modified:   perf/benches/recycler.rs
	modified:   perf/benches/sigverify.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/recycler.rs
	modified:   perf/src/sigverify.rs
	modified:   streamer/src/packet.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   core/src/ancestor_hashes_service.rs
	both modified:   core/src/banking_stage.rs
	both modified:   core/src/cluster_info_vote_listener.rs
	both modified:   core/src/fetch_stage.rs
	both modified:   core/src/serve_repair.rs
	both modified:   core/src/shred_fetch_stage.rs
	both modified:   core/src/sigverify_stage.rs
	both modified:   core/src/verified_vote_packets.rs
	both modified:   core/src/window_service.rs
	both modified:   gossip/src/cluster_info.rs
	both modified:   ledger/src/entry.rs
	both modified:   streamer/src/streamer.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

(cherry picked from commit 254ef3e)

# Conflicts:
#	core/src/ancestor_hashes_service.rs
#	core/src/banking_stage.rs
#	core/src/cluster_info_vote_listener.rs
#	core/src/fetch_stage.rs
#	core/src/serve_repair.rs
#	core/src/shred_fetch_stage.rs
#	core/src/sigverify_stage.rs
#	core/src/verified_vote_packets.rs
#	core/src/window_service.rs
#	gossip/src/cluster_info.rs
#	ledger/src/entry.rs
#	streamer/src/streamer.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 11, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 11, 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 11, 2021
@jstarry jstarry force-pushed the mergify/bp/v1.8/pr-21794 branch from 0fe1734 to d14d45c Compare December 11, 2021 15:33
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Dec 11, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

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

codecov Bot commented Dec 11, 2021

Codecov Report

Merging #21804 (d14d45c) into v1.8 (73acae9) will decrease coverage by 0.0%.
The diff coverage is 82.1%.

@@            Coverage Diff            @@
##             v1.8   #21804     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         459      459             
  Lines      130495   130507     +12     
=========================================
- Hits       106546   106545      -1     
- Misses      23949    23962     +13     

@mergify mergify Bot merged commit 39e27b1 into v1.8 Dec 11, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-21794 branch December 11, 2021 17:32
t-nelson added a commit to t-nelson/solana that referenced this pull request Dec 13, 2021
tao-stones pushed a commit that referenced this pull request Dec 13, 2021
CriesofCarrots pushed a commit to CriesofCarrots/solana that referenced this pull request Dec 16, 2021
CriesofCarrots pushed a commit that referenced this pull request Dec 17, 2021
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 5, 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 5, 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.

2 participants