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

Repair alternate versions of dead slots (bp #9805)#9886

Merged
solana-grimes merged 2 commits intov1.1from
mergify/bp/v1.1/pr-9805
May 6, 2020
Merged

Repair alternate versions of dead slots (bp #9805)#9886
solana-grimes merged 2 commits intov1.1from
mergify/bp/v1.1/pr-9805

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented May 5, 2020

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

Cherry-pick of 3442f36 has failed:

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

You are currently cherry-picking commit 3442f36f8.
  (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/broadcast_stage/fail_entry_verification_broadcast_run.rs
	modified:   core/src/cluster_slots.rs
	modified:   core/src/repair_service.rs
	modified:   core/src/replay_stage.rs
	modified:   core/src/retransmit_stage.rs
	modified:   core/src/serve_repair.rs
	modified:   core/src/tvu.rs
	modified:   ledger/src/bank_forks.rs
	modified:   ledger/src/blockstore.rs
	modified:   ledger/src/blockstore_meta.rs
	modified:   local-cluster/src/cluster_tests.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   runtime/src/accounts_index.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/genesis_utils.rs
	modified:   runtime/src/status_cache.rs

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

	both modified:   runtime/src/accounts_db.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/

Co-authored-by: Carl <carl@solana.com>
(cherry picked from commit 3442f36)

# Conflicts:
#	runtime/src/accounts_db.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels May 5, 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 May 5, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label May 5, 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 May 5, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label May 6, 2020
@solana-grimes solana-grimes merged commit e85f9fc into v1.1 May 6, 2020
@codecov
Copy link
Copy Markdown

codecov Bot commented May 6, 2020

Codecov Report

Merging #9886 into v1.1 will increase coverage by 0.0%.
The diff coverage is 86.4%.

@@          Coverage Diff           @@
##            v1.1   #9886    +/-   ##
======================================
  Coverage   80.7%   80.7%            
======================================
  Files        282     282            
  Lines      64194   64781   +587     
======================================
+ Hits       51818   52330   +512     
- Misses     12376   12451    +75     

@mergify mergify Bot deleted the mergify/bp/v1.1/pr-9805 branch May 6, 2020 02:22
carllin added a commit to carllin/solana that referenced this pull request May 7, 2020
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