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

runtime: add rent debit charges to block metadata (backport #17504) #17513

Merged
merged 2 commits into from
May 26, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 26, 2021

This is an automatic backport of pull request #17504 done by Mergify.
Cherry-pick of 97eab7e has failed:

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

You are currently cherry-picking commit 97eab7edf.
  (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/bank.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/accounts.rs

Cherry-pick of 2a6c5ed has failed:

On branch mergify/bp/v1.6/pr-17504
Your branch is ahead of 'origin/v1.6' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2a6c5ed0a.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs

no changes added to commit (use "git add" and/or "git commit -a")

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 conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels May 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 26, 2021

automerge label removed due to a CI failure

@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-17504 branch from 244e94a to f84d1fb Compare May 26, 2021 13:54
@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 May 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 26, 2021

automerge label removed due to a CI failure

t-nelson added 2 commits May 26, 2021 08:20
@t-nelson t-nelson force-pushed the mergify/bp/v1.6/pr-17504 branch from f84d1fb to 2abbc1e Compare May 26, 2021 14:20
@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 May 26, 2021
@mergify
Copy link
Contributor Author

mergify bot commented May 26, 2021

automerge label removed due to a CI failure

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

codecov bot commented May 26, 2021

Codecov Report

Merging #17513 (2abbc1e) into v1.6 (4d58a0e) will decrease coverage by 0.0%.
The diff coverage is 98.0%.

@@            Coverage Diff            @@
##             v1.6   #17513     +/-   ##
=========================================
- Coverage    82.6%    82.6%   -0.1%     
=========================================
  Files         423      423             
  Lines      116456   116495     +39     
=========================================
+ Hits        96271    96288     +17     
- Misses      20185    20207     +22     

@mergify mergify bot merged commit 2781d69 into v1.6 May 26, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-17504 branch May 26, 2021 15:39
@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