Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.1: rolls out chained Merkle shreds to ~5% of mainnet slots (backport of #4019) #4131

Merged
merged 2 commits into from
Dec 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 16, 2024

Problem

Rolling out chained Merkle shreds to testnet.

Summary of Changes

The commit rolls out chained Merkle shreds to ~5% of mainnet slots.


This is an automatic backport of pull request #4019 done by Mergify.

@mergify mergify bot added the conflicts label Dec 16, 2024
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 00:00
Copy link
Author

mergify bot commented Dec 16, 2024

Cherry-pick of d3fe8f8 has failed:

On branch mergify/bp/v2.1/pr-4019
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit d3fe8f8a0.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   turbine/src/broadcast_stage/standard_broadcast_run.rs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

(cherry picked from commit d3fe8f8)

# Conflicts:
#	turbine/src/broadcast_stage/standard_broadcast_run.rs
@behzadnouri behzadnouri force-pushed the mergify/bp/v2.1/pr-4019 branch from e4b6e7f to d713e2d Compare December 16, 2024 20:29
@behzadnouri behzadnouri added the automerge automerge Merge this Pull Request automatically once CI passes label Dec 16, 2024
@behzadnouri behzadnouri merged commit 1e91378 into v2.1 Dec 18, 2024
29 checks passed
@behzadnouri behzadnouri deleted the mergify/bp/v2.1/pr-4019 branch December 18, 2024 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants