Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

consensus: check proposal non-nil in prevote message delay metric (backport #7625) #7631

Merged
merged 3 commits into from Jan 19, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 19, 2022

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

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

You are currently cherry-picking commit b6307c42e.
  (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:   consensus/state.go

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://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 b6307c4)

# Conflicts:
#	consensus/state.go
@williambanfield williambanfield added S:automerge Automatically merge PR when requirements pass and removed conflicts labels Jan 19, 2022
@williambanfield williambanfield merged commit 80f656d into v0.34.x Jan 19, 2022
@williambanfield williambanfield deleted the mergify/bp/v0.34.x/pr-7625 branch January 19, 2022 18:16
@williambanfield williambanfield restored the mergify/bp/v0.34.x/pr-7625 branch September 9, 2022 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S:automerge Automatically merge PR when requirements pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant