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

Consume from AccountsDataMeter (backport #21994)#22323

Merged
mergify[bot] merged 4 commits intov1.9from
mergify/bp/v1.9/pr-21994
Jan 6, 2022
Merged

Consume from AccountsDataMeter (backport #21994)#22323
mergify[bot] merged 4 commits intov1.9from
mergify/bp/v1.9/pr-21994

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 6, 2022

This is an automatic backport of pull request #21994 done by Mergify.
Cherry-pick of 1460f00 has failed:

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

You are currently cherry-picking commit 1460f00e0.
  (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:   program-runtime/src/accounts_data_meter.rs
	modified:   runtime/src/bank.rs

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

(cherry picked from commit 1460f00)

# Conflicts:
#	program-runtime/src/invoke_context.rs
@mergify mergify Bot added the conflicts label Jan 6, 2022
@brooksprumo brooksprumo self-assigned this Jan 6, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 6, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 6, 2022
@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 Jan 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 6, 2022

automerge label removed due to a CI failure

@brooksprumo brooksprumo requested a review from Lichtso January 6, 2022 14:49
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 6, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 6, 2022

Codecov Report

Merging #22323 (026b236) into v1.9 (687cd47) will increase coverage by 0.0%.
The diff coverage is 98.3%.

@@           Coverage Diff            @@
##             v1.9   #22323    +/-   ##
========================================
  Coverage    81.0%    81.1%            
========================================
  Files         519      519            
  Lines      145297   145415   +118     
========================================
+ Hits       117829   117970   +141     
+ Misses      27468    27445    -23     

@mergify mergify Bot merged commit 7267eba into v1.9 Jan 6, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-21994 branch January 6, 2022 17:01
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 2, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Apr 2, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants