8000 getBlockProduction RPC method now correctly reports block production (backport #17112) by mergify[bot] · Pull Request #17116 · solana-labs/solana · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

getBlockProduction RPC method now correctly reports block production (backport #17112) #17116

Merged
merged 1 commit into from
May 8, 2021

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 8, 2021

This is an automatic backport of pull request #17112 done by Mergify.
Cherry-pick of d6c076f has failed:

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

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

Changes to be committed:
	modified:   docs/src/developing/clients/jsonrpc-api.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/rpc.rs

To fix up this pull request, you can check it out 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 config editor.

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

@mergify mergify bot added the conflicts label May 8, 2021
@mvines mvines force-pushed the mergify/bp/v1.6/pr-17112 branch from 5fc9785 to c00f1bc Compare May 8, 2021 03:06
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 8, 2021
@codecov
Copy link
codecov bot commented May 8, 2021

Codecov Report

Merging #17116 (c00f1bc) into v1.6 (072e884) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.6   #17116   +/-   ##
=======================================
  Coverage    82.7%    82.7%           
=======================================
  Files         418      418           
  Lines      115690   115726   +36     
=======================================
+ Hits        95682    95771   +89     
+ Misses      20008    19955   -53     

@mergify mergify bot merged commit 28b9e5b into v1.6 May 8, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-17112 branch May 8, 2021 04:19
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
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.

1 participant
0