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

getLeaderSchedule now supports filtered results based on validator identity (backport #16723) #16731

Merged
merged 1 commit into from
Apr 22, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 22, 2021

This is an automatic backport of pull request #16723 done by Mergify.

Cherry-pick of 6004c0a has failed:

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

You are currently cherry-picking commit 6004c0abf.
  (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:   client/src/rpc_config.rs
	modified:   client/src/rpc_response.rs
	modified:   core/src/rpc.rs
	modified:   docs/src/developing/clients/jsonrpc-api.md
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   client/src/rpc_client.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 config editor.

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

@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 Apr 22, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Apr 22, 2021

automerge label removed due to a CI failure

@mvines mvines force-pushed the mergify/bp/v1.6/pr-16723 branch from 997ae9a to c73a7b2 Compare April 22, 2021 01:05
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 22, 2021
@codecov
Copy link

codecov bot commented Apr 22, 2021

Codecov Report

Merging #16731 (c73a7b2) into v1.6 (e51d7af) will increase coverage by 0.0%.
The diff coverage is 82.0%.

@@           Coverage Diff           @@
##             v1.6   #16731   +/-   ##
=======================================
  Coverage    82.9%    82.9%           
=======================================
  Files         414      414           
  Lines      113979   114013   +34     
=======================================
+ Hits        94520    94553   +33     
- Misses      19459    19460    +1     

@mergify mergify bot merged commit 13e176a into v1.6 Apr 22, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16723 branch April 22, 2021 02:29
@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