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

add metric for collecting storages (backport #17527) #17675

Merged
merged 1 commit into from
Jun 3, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2021

This is an automatic backport of pull request #17527 done by Mergify.
Cherry-pick of 72bb271 has failed:

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

You are currently cherry-picking commit 72bb271a9.
  (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/accounts_hash.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/accounts_db.rs
	both modified:   runtime/src/snapshot_utils.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
(cherry picked from commit 72bb271)

# Conflicts:
#	runtime/src/accounts_db.rs
#	runtime/src/snapshot_utils.rs
@jeffwashington jeffwashington force-pushed the mergify/bp/v1.7/pr-17527 branch from 06ca12e to 6bf91d4 Compare June 3, 2021 03:42
@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 #17675 (6bf91d4) into v1.7 (04fbf73) will increase coverage by 0.0%.
The diff coverage is 94.7%.

@@           Coverage Diff           @@
##             v1.7   #17675   +/-   ##
=======================================
  Coverage    82.5%    82.5%           
=======================================
  Files         428      428           
  Lines      119472   119489   +17     
=======================================
+ Hits        98681    98696   +15     
- Misses      20791    20793    +2     

@mergify mergify bot merged commit a00fbbf into v1.7 Jun 3, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17527 branch June 3, 2021 05:34
@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