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

adds metrics for number of nodes vs number of pubkeys (backport #20512) #20524

Merged
merged 2 commits into from
Oct 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2021

This is an automatic backport of pull request #20512 done by Mergify.
Cherry-pick of 0da661d has failed:

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

You are currently cherry-picking commit 0da661de6.
  (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:   gossip/src/crds.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gossip/src/cluster_info_metrics.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.io/

(cherry picked from commit 0da661d)

# Conflicts:
#	gossip/src/cluster_info_metrics.rs
@mergify mergify bot added the conflicts label Oct 7, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 7, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Oct 7, 2021
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@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 Oct 7, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2021

automerge label removed due to a CI failure

@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 Oct 7, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2021

automerge label removed due to a CI failure

@behzadnouri behzadnouri merged commit 6a73bf7 into v1.8 Oct 7, 2021
@behzadnouri behzadnouri deleted the mergify/bp/v1.8/pr-20512 branch October 7, 2021 22:27
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants