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

Cleanup ReplayStage test replay_blockstore_components() (backport #18241) #18292

Merged
merged 1 commit into from
Jul 1, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2021

This is an automatic backport of pull request #18241 done by Mergify.
Cherry-pick of 68c8746 has failed:

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

You are currently cherry-picking commit 68c87469c.
  (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/replay_stage.rs

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

To fix up this pull request, you can check it out 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 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.io/

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 29, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 29, 2021

automerge label removed due to a CI failure

@carllin carllin force-pushed the mergify/bp/v1.7/pr-18241 branch from aaffca1 to bdde5e4 Compare June 30, 2021 01:45
@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 Jun 30, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 30, 2021

automerge label removed due to a CI failure

@codecov
Copy link

codecov bot commented Jun 30, 2021

Codecov Report

Merging #18292 (49fcc9c) into v1.7 (4466aa3) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.7   #18292   +/-   ##
=======================================
  Coverage    82.4%    82.4%           
=======================================
  Files         432      432           
  Lines      120870   120868    -2     
=======================================
+ Hits        99693    99710   +17     
+ Misses      21177    21158   -19     

@carllin carllin force-pushed the mergify/bp/v1.7/pr-18241 branch from bdde5e4 to 62af004 Compare July 1, 2021 02:55
@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 Jul 1, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 1, 2021

automerge label removed due to a CI failure

(cherry picked from commit 68c8746)
@carllin carllin force-pushed the mergify/bp/v1.7/pr-18241 branch from 62af004 to 49fcc9c Compare July 1, 2021 06:10
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 1, 2021
@mergify mergify bot merged commit d26533e into v1.7 Jul 1, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18241 branch July 1, 2021 07:47
@brooksprumo brooksprumo mentioned this pull request Aug 23, 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