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

More shred filtering (bp #8975) #8979

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2020

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

Cherry-pick of 453f5ce has failed:

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

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

Changes to be committed:

	modified:   archiver-lib/src/archiver.rs
	modified:   core/src/tvu.rs

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

	both modified:   core/src/shred_fetch_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
  • @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/

Thread bank_forks into shred fetch

(cherry picked from commit 453f5ce)

# Conflicts:
#	core/src/shred_fetch_stage.rs
@mergify mergify bot added the conflicts label Mar 20, 2020
@sakridge
Copy link
Contributor

Conflicts resolved in #8987

@sakridge sakridge closed this Mar 20, 2020
@sakridge sakridge deleted the mergify/bp/v1.0/pr-8975 branch March 20, 2020 17:34
This was referenced Oct 11, 2023
This was referenced May 12, 2024
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant