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

adds back position field to coding-shred-header (backport #21600)#21619

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

adds back position field to coding-shred-header (backport #21600)#21619
mergify[bot] merged 2 commits intov1.8from
mergify/bp/v1.8/pr-21600

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Dec 5, 2021

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

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

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

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

#17004
removed position field from coding-shred-header because as it stands the
field is redundant and unused.
However, with the upcoming changes to erasure coding schema this field
will no longer be redundant and needs to be populated.

(cherry picked from commit cd17f63)

# Conflicts:
#	core/src/window_service.rs
#	ledger/src/blockstore.rs
#	ledger/src/shred.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Dec 5, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 5, 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 5, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 5, 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 5, 2021
@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-21600 branch from e6dbde7 to c9a3b9e Compare December 5, 2021 15:01
@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 5, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 5, 2021

automerge label removed due to a CI failure

@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-21600 branch from c9a3b9e to e29cb8c Compare December 5, 2021 15:03
@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 5, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Dec 5, 2021

automerge label removed due to a CI failure

@behzadnouri behzadnouri force-pushed the mergify/bp/v1.8/pr-21600 branch from e29cb8c to d1d2a2e Compare December 5, 2021 15:18
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Dec 5, 2021
@mergify mergify Bot merged commit 6d1e128 into v1.8 Dec 5, 2021
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-21600 branch December 5, 2021 17:12
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
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant