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

Remove loop in ReplayStage (bp #8493) #8495

Merged
merged 1 commit into from
Feb 27, 2020
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2020

This is an automated backport of pull request #8493 done by Mergify.io

Cherry-pick of 5f766cd has failed:

On branch mergify/bp/v0.23/pr-8493
Your branch is up to date with 'origin/v0.23'.

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

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

	both modified:   core/src/replay_stage.rs

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

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 backports <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/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 27, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 27, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@carllin carllin force-pushed the mergify/bp/v0.23/pr-8493 branch from 9c20626 to b770072 Compare February 27, 2020 07:01
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 27, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to merge conflict

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 27, 2020
@codecov
Copy link

codecov bot commented Feb 27, 2020

Codecov Report

Merging #8495 into v0.23 will decrease coverage by <.1%.
The diff coverage is 80.9%.

@@           Coverage Diff           @@
##           v0.23   #8495     +/-   ##
=======================================
- Coverage   80.6%   80.6%   -0.1%     
=======================================
  Files        251     251             
  Lines      55917   55911      -6     
=======================================
- Hits       45125   45119      -6     
  Misses     10792   10792

@carllin carllin force-pushed the mergify/bp/v0.23/pr-8493 branch from b770072 to 0e0b3f2 Compare February 27, 2020 09:12
@carllin carllin force-pushed the mergify/bp/v0.23/pr-8493 branch from 0e0b3f2 to 70c254a Compare February 27, 2020 09:12
@carllin carllin merged commit 18b55bb into v0.23 Feb 27, 2020
@mergify mergify bot deleted the mergify/bp/v0.23/pr-8493 branch February 27, 2020 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants