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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2021

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

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

You are currently cherry-picking commit db8811eac.
  (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:   runtime/src/lib.rs
	new file:   runtime/src/pubkey_bins.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/accounts_db.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 Jun 2, 2021
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17563 branch from f21c074 to adcaafa Compare June 3, 2021 04:11
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 3, 2021

automerge label removed due to a CI failure

@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17563 branch from adcaafa to 59ebef2 Compare June 3, 2021 17:09
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 3, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2021
@codecov
Copy link

codecov bot commented Jun 3, 2021

Codecov Report

Merging #17692 (de0bf9b) into v1.7 (498bf91) will increase coverage by 0.0%.
The diff coverage is 94.0%.

@@           Coverage Diff            @@
##             v1.7   #17692    +/-   ##
========================================
  Coverage    82.5%    82.6%            
========================================
  Files         428      431     +3     
  Lines      119545   119715   +170     
========================================
+ Hits        98741    98934   +193     
+ Misses      20804    20781    -23     

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 3, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 3, 2021

automerge label removed due to a CI failure

@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17563 branch from 59ebef2 to 07fbdf1 Compare June 4, 2021 03:36
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 4, 2021

automerge label removed due to a CI failure

* support bin divisions up to 65536

* add tests

(cherry picked from commit db8811e)

# Conflicts:
#	runtime/src/accounts_db.rs
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17563 branch from 07fbdf1 to de0bf9b Compare June 4, 2021 04:43
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 4, 2021
@mergify mergify bot merged commit ae42413 into v1.7 Jun 4, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17563 branch June 4, 2021 06:33
@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.

2 participants