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

validator: Forge a confirmed root before halting for RPC inspection (bp #10061) #10066

Merged
merged 2 commits into from
May 15, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 15, 2020

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

Cherry-pick of 1da1667 has failed:

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

You are currently cherry-picking commit 1da166792.
  (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/validator.rs

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

	both modified:   core/src/commitment.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/

(cherry picked from commit 1da1667)

# Conflicts:
#	core/src/commitment.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels May 15, 2020
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label May 15, 2020
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@codecov
Copy link

codecov bot commented May 15, 2020

Codecov Report

Merging #10066 into v1.0 will decrease coverage by 0.0%.
The diff coverage is 0.0%.

@@           Coverage Diff            @@
##            v1.0   #10066     +/-   ##
========================================
- Coverage   80.1%    80.0%   -0.1%     
========================================
  Files        274      274             
  Lines      60352    60354      +2     
========================================
- Hits       48349    48335     -14     
- Misses     12003    12019     +16     

@mvines mvines merged commit 859d4db into v1.0 May 15, 2020
@mergify mergify bot deleted the mergify/bp/v1.0/pr-10061 branch May 15, 2020 21:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants