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

v1.14: tower: when syncing from vote state, update last_vote (backport of #32944) #32959

Merged
merged 2 commits into from
Aug 24, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2023

This is an automatic backport of pull request #32944 done by Mergify.
Cherry-pick of 329c6f1 has failed:

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

You are currently cherry-picking commit 329c6f131b.
  (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:   core/src/replay_stage.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/consensus.rs
	both modified:   programs/vote/src/vote_state/mod.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

* tower: when syncing from vote state, update last_vote

* pr: bubble error through unchecked

(cherry picked from commit 329c6f1)

# Conflicts:
#	core/src/consensus.rs
#	programs/vote/src/vote_state/mod.rs
@codecov
Copy link

codecov bot commented Aug 23, 2023

Codecov Report

Merging #32959 (b96790a) into v1.14 (f717db6) will increase coverage by 0.0%.
The diff coverage is 90.7%.

@@           Coverage Diff           @@
##            v1.14   #32959   +/-   ##
=======================================
  Coverage    82.1%    82.1%           
=======================================
  Files         665      665           
  Lines      185541   185595   +54     
=======================================
+ Hits       152474   152538   +64     
+ Misses      33067    33057   -10     

@AshwinSekar AshwinSekar merged commit 258ae84 into v1.14 Aug 24, 2023
4 checks passed
@AshwinSekar AshwinSekar deleted the mergify/bp/v1.14/pr-32944 branch August 24, 2023 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants