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

Add missing fields from getClusterNodes documentation (backport #17501) #17502

Merged
merged 2 commits into from
May 27, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2021

This is an automatic backport of pull request #17501 done by Mergify.
Cherry-pick of 3d40ec3 has failed:

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

You are currently cherry-picking commit 3d40ec3c8.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/src/developing/clients/jsonrpc-api.md

no changes added to commit (use "git add" and/or "git commit -a")

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/

(cherry picked from commit 3d40ec3)

# Conflicts:
#	docs/src/developing/clients/jsonrpc-api.md
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels May 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 26, 2021

automerge label removed due to a CI failure

@codecov
Copy link

codecov bot commented May 26, 2021

Codecov Report

Merging #17502 (3d40ec3) into v1.6 (b06bfee) will increase coverage by 0.0%.
The diff coverage is 54.9%.

❗ Current head 3d40ec3 differs from pull request most recent head 89c59b9. Consider uploading reports for the commit 89c59b9 to get more accurate results

@@            Coverage Diff            @@
##             v1.6   #17502     +/-   ##
=========================================
  Coverage    82.6%    82.6%             
=========================================
  Files         423      425      +2     
  Lines      116481   118840   +2359     
=========================================
+ Hits        96288    98261   +1973     
- Misses      20193    20579    +386     

@mvines mvines merged commit 8b61ba4 into v1.6 May 27, 2021
@mvines mvines deleted the mergify/bp/v1.6/pr-17501 branch May 27, 2021 04:38
@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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant