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

Port various rent fixes to runtime feature (bp #12842) #13067

Merged
merged 2 commits into from
Oct 21, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 21, 2020

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

Cherry-pick of 608b81b has failed:

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

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

Changes to be committed:

	modified:   runtime/src/accounts.rs
	modified:   runtime/src/feature_set.rs
	modified:   runtime/src/rent_collector.rs

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

	both modified:   runtime/src/bank.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/

* Port various rent fixes to runtime feature

* Fix CI

* Use more consistent naming...

(cherry picked from commit 608b81b)

# Conflicts:
#	runtime/src/bank.rs
@mergify mergify bot added the conflicts label Oct 21, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2020
@codecov
Copy link

codecov bot commented Oct 21, 2020

Codecov Report

Merging #13067 into v1.3 will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff           @@
##            v1.3   #13067   +/-   ##
======================================
  Coverage   82.0%    82.0%           
======================================
  Files        362      362           
  Lines      84475    84472    -3     
======================================
+ Hits       69337    69344    +7     
+ Misses     15138    15128   -10     

@mergify mergify bot merged commit 63fe350 into v1.3 Oct 21, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-12842 branch October 21, 2020 14:48
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