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

Just define BnakSlotDelta type alias (bp #8186)#8320

Merged
solana-grimes merged 2 commits intov0.23from
mergify/bp/v0.23/pr-8186
Feb 19, 2020
Merged

Just define BnakSlotDelta type alias (bp #8186)#8320
solana-grimes merged 2 commits intov0.23from
mergify/bp/v0.23/pr-8186

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 18, 2020

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

Cherry-pick of 485806c has failed:

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

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

Changes to be committed:

	modified:   core/src/snapshot_packager_service.rs
	modified:   core/tests/bank_forks.rs
	modified:   ledger/src/snapshot_package.rs
	modified:   runtime/src/bank.rs

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

	both modified:   ledger/src/snapshot_utils.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 [documention](https://doc.mergify.io/).

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/

automerge

(cherry picked from commit 485806c)

# Conflicts:
#	ledger/src/snapshot_utils.rs
@ryoqun
Copy link
Copy Markdown
Contributor

ryoqun commented Feb 18, 2020

oah, this is rather desired to be backported for the upcoming fix #8168

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 18, 2020
@solana-grimes solana-grimes merged commit ede3781 into v0.23 Feb 19, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 19, 2020

Codecov Report

Merging #8320 into v0.23 will not change coverage.
The diff coverage is 20%.

@@          Coverage Diff          @@
##           v0.23   #8320   +/-   ##
=====================================
  Coverage   80.8%   80.8%           
=====================================
  Files        251     251           
  Lines      54820   54820           
=====================================
  Hits       44333   44333           
  Misses     10487   10487

@mergify mergify Bot deleted the mergify/bp/v0.23/pr-8186 branch February 19, 2020 00:32
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants