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

Support opening an in-use rocksdb as secondary (bp #10209)#10381

Merged
solana-grimes merged 2 commits intov1.1from
mergify/bp/v1.1/pr-10209
Jun 3, 2020
Merged

Support opening an in-use rocksdb as secondary (bp #10209)#10381
solana-grimes merged 2 commits intov1.1from
mergify/bp/v1.1/pr-10209

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 3, 2020

This is an automated backport of pull request #10209 done by Mergify

Cherry-pick of caa7f7a has failed:

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

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

Changes to be committed:

	modified:   Cargo.lock
	modified:   genesis/src/main.rs
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore_db.rs
	modified:   ledger/src/blockstore_processor.rs

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

	both modified:   ledger-tool/Cargo.toml
	both modified:   ledger-tool/src/main.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 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 simulator.

Finally, you can contact us on https://mergify.io/

automerge

(cherry picked from commit caa7f7a)

# Conflicts:
#	ledger-tool/Cargo.toml
#	ledger-tool/src/main.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jun 3, 2020
@solana-grimes
Copy link
Copy Markdown
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented Jun 3, 2020

Codecov Report

Merging #10381 into v1.1 will increase coverage by 0.0%.
The diff coverage is 68.1%.

@@          Coverage Diff           @@
##            v1.1   #10381   +/-   ##
======================================
  Coverage   80.6%    80.7%           
======================================
  Files        289      289           
  Lines      66881    66923   +42     
======================================
+ Hits       53955    54033   +78     
+ Misses     12926    12890   -36     

@solana-grimes solana-grimes merged commit 8d89eac into v1.1 Jun 3, 2020
@mergify mergify Bot deleted the mergify/bp/v1.1/pr-10209 branch June 3, 2020 06:52
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.

2 participants