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

Rename snapshot.tar.bz2 to snapshot-<slot>-<hash>.tar.bz2 (bp #8482) #8500

Merged
merged 2 commits into from
Feb 27, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2020

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

Cherry-pick of fcabc6f has failed:

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

You are currently cherry-picking commit fcabc6f79.
  (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/Cargo.toml
	modified:   core/src/rpc_service.rs
	modified:   core/src/snapshot_packager_service.rs
	modified:   ledger-tool/src/main.rs
	modified:   ledger/Cargo.toml
	modified:   ledger/src/bank_forks.rs
	modified:   ledger/src/snapshot_utils.rs
	modified:   validator/src/main.rs

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

	both modified:   Cargo.lock
	both modified:   ledger/src/bank_forks_utils.rs

Cherry-pick of 0d4cb25 has failed:

On branch mergify/bp/v0.23/pr-8482
Your branch is ahead of 'origin/v0.23' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0d4cb252c.
  (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/tests/bank_forks.rs
	modified:   ledger-tool/src/main.rs
	modified:   ledger/src/bank_forks.rs
	modified:   local-cluster/tests/local_cluster.rs

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

	both modified:   ledger/src/bank_forks_utils.rs
	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 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/

@mvines mvines force-pushed the mergify/bp/v0.23/pr-8482 branch from 6448384 to 1e6b4ed Compare February 27, 2020 06:46
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 27, 2020
@solana-grimes solana-grimes merged commit 85637e8 into v0.23 Feb 27, 2020
@codecov
Copy link

codecov bot commented Feb 27, 2020

Codecov Report

❗ No coverage uploaded for pull request base (v0.23@eb3b5d7). Click here to learn what that means.
The diff coverage is 48.7%.

@@           Coverage Diff           @@
##             v0.23   #8500   +/-   ##
=======================================
  Coverage         ?   80.6%           
=======================================
  Files            ?     251           
  Lines            ?   55917           
  Branches         ?       0           
=======================================
  Hits             ?   45124           
  Misses           ?   10793           
  Partials         ?       0

@mergify mergify bot deleted the mergify/bp/v0.23/pr-8482 branch February 27, 2020 08:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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