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

Rpc: optionally filter getLargestAccounts by circulating/nonCirculating (bp #10007) #10014

Merged
merged 1 commit into from
May 13, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2020

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

Cherry-pick of ee7f15e has failed:

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

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

Changes to be committed:

	modified:   cli/src/cli.rs
	modified:   cli/src/cli_output.rs
	modified:   cli/src/cluster_query.rs
	modified:   client/src/lib.rs
	modified:   client/src/rpc_client.rs
	new file:   client/src/rpc_config.rs
	modified:   client/src/rpc_request.rs
	modified:   core/tests/rpc.rs
	modified:   docs/src/apps/jsonrpc-api.md

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

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

@mergify mergify bot added the conflicts label May 13, 2020
…ng (#10007)

* Add circ/non-circ filter to getLargestAccounts

* Plumb largest accounts into client and cli

* Bump timeout toward CI flakiness

* Update docs

(cherry picked from commit ee7f15e)
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.1/pr-10007 branch from 5008dd8 to 257a13a Compare May 13, 2020 03:16
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label May 13, 2020
@codecov
Copy link

codecov bot commented May 13, 2020

Codecov Report

Merging #10014 into v1.1 will decrease coverage by 0.1%.
The diff coverage is 63.2%.

@@           Coverage Diff            @@
##            v1.1   #10014     +/-   ##
========================================
- Coverage   80.6%    80.4%   -0.2%     
========================================
  Files        285      288      +3     
  Lines      64886    66638   +1752     
========================================
+ Hits       52354    53640   +1286     
- Misses     12532    12998    +466     

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants