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

validator: Added --health-check-slot-distance (bp #10324) #10330

Merged
merged 2 commits into from
May 30, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2020

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

Cherry-pick of eb45aaa has failed:

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

You are currently cherry-picking commit eb45aaa6c.
  (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/rpc.rs
	modified:   validator/src/main.rs

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

	both modified:   core/src/rpc_service.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 eb45aaa)

# Conflicts:
#	core/src/rpc_service.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels May 29, 2020
@solana-grimes
Copy link
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 29, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 29, 2020
@codecov
Copy link

codecov bot commented May 30, 2020

Codecov Report

Merging #10330 into v1.1 will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff           @@
##            v1.1   #10330   +/-   ##
======================================
  Coverage   80.7%    80.7%           
======================================
  Files        288      288           
  Lines      66593    66599    +6     
======================================
+ Hits       53772    53777    +5     
- Misses     12821    12822    +1     

@solana-grimes solana-grimes merged commit c344a87 into v1.1 May 30, 2020
@mergify mergify bot deleted the mergify/bp/v1.1/pr-10324 branch May 30, 2020 00:49
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 conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants