Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 3, 2023

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

On branch mergify/bp/v0.34.x/pr-1512
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit b50bca37c.
  (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:
	new file:   .changelog/unreleased/features/1512-metric-mempool-size-bytes.md
	modified:   mempool/v0/clist_mempool.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   mempool/metrics.gen.go
	both modified:   mempool/metrics.go

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

* mempool: Add metric `SizeBytes`

* Safe concurrent read of txsBytes

* Add changelog

(cherry picked from commit b50bca3)

# Conflicts:
#	mempool/metrics.gen.go
#	mempool/metrics.go
@mergify mergify bot requested a review from a team as a code owner November 3, 2023 22:46
@mergify mergify bot added the conflicts label Nov 3, 2023
Copy link
Contributor

@lasarojc lasarojc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approving in spite of the linter errors as these are in the 0.34 code, which is frozen except for security issues.

@lasarojc lasarojc merged commit 1064665 into v0.34.x Nov 13, 2023
@lasarojc lasarojc deleted the mergify/bp/v0.34.x/pr-1512 branch November 13, 2023 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants