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

parallel get_snapshot_storages (backport #17589) #17679

Merged
merged 1 commit into from
Jun 3, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2021

This is an automatic backport of pull request #17589 done by Mergify.
Cherry-pick of 738cc95 has failed:

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

You are currently cherry-picking commit 738cc9549.
  (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:   runtime/src/accounts_db.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/serde_snapshot/tests.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://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 2, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 2, 2021

automerge label removed due to a CI failure

@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17589 branch 2 times, most recently from 6bfc571 to 6262278 Compare June 3, 2021 03:56
@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 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 3, 2021

automerge label removed due to a CI failure

(cherry picked from commit 738cc95)

# Conflicts:
#	runtime/src/accounts_db.rs
#	runtime/src/bank.rs
#	runtime/src/serde_snapshot/tests.rs
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17589 branch from 6262278 to e402e43 Compare June 3, 2021 17:01
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2021
@codecov
Copy link

codecov bot commented Jun 3, 2021

Codecov Report

Merging #17679 (e402e43) into v1.7 (a00fbbf) will decrease coverage by 0.0%.
The diff coverage is 98.5%.

@@            Coverage Diff            @@
##             v1.7   #17679     +/-   ##
=========================================
- Coverage    82.6%    82.6%   -0.1%     
=========================================
  Files         428      428             
  Lines      119576   119618     +42     
=========================================
+ Hits        98789    98816     +27     
- Misses      20787    20802     +15     

@mergify mergify bot merged commit ea44a71 into v1.7 Jun 3, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17589 branch June 3, 2021 18:32
@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