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

getConfirmedBlocks now has an upper limit on slot range (bp #10927) #10995

Merged
merged 2 commits into from
Jul 11, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 10, 2020

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

Cherry-pick of aef6bf2 has failed:

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

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

Changes to be committed:

	modified:   client/src/rpc_request.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/

(cherry picked from commit aef6bf2)

# Conflicts:
#	core/src/rpc.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jul 10, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Jul 10, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 10, 2020
@codecov
Copy link

codecov bot commented Jul 10, 2020

Codecov Report

Merging #10995 into v1.1 will decrease coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff            @@
##            v1.1   #10995     +/-   ##
========================================
- Coverage   81.2%    81.1%   -0.1%     
========================================
  Files        292      292             
  Lines      68682    68702     +20     
========================================
- Hits       55793    55751     -42     
- Misses     12889    12951     +62     

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