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

adds ShredId uniquely identifying each shred (backport #21820) #22940

Merged
merged 2 commits into from
Feb 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2022

This is an automatic backport of pull request #21820 done by Mergify.
Cherry-pick of 4ceb268 has failed:

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

You are currently cherry-picking commit 4ceb2689f.
  (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/retransmit_stage.rs
	modified:   core/src/window_service.rs
	modified:   ledger/src/shred.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/src/blockstore.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 4ceb268)

# Conflicts:
#	ledger/src/blockstore.rs
@mergify mergify bot added the conflicts label Feb 4, 2022
@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 Feb 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 4, 2022

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 Feb 4, 2022
@codecov
Copy link

codecov bot commented Feb 4, 2022

Codecov Report

Merging #22940 (a15c145) into v1.8 (add26be) will increase coverage by 0.0%.
The diff coverage is 97.1%.

@@           Coverage Diff            @@
##             v1.8   #22940    +/-   ##
========================================
  Coverage    81.6%    81.6%            
========================================
  Files         464      464            
  Lines      131709   131940   +231     
========================================
+ Hits       107555   107791   +236     
+ Misses      24154    24149     -5     

@mergify mergify bot merged commit 9361a50 into v1.8 Feb 4, 2022
@mergify mergify bot deleted the mergify/bp/v1.8/pr-21820 branch February 4, 2022 20:50
@github-actions
Copy link
Contributor

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 Mar 30, 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