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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Aug 24, 2023
Merged

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

merged 3 commits into from
Aug 24, 2023

Commits on Aug 23, 2023

  1. tower: when syncing from vote state, update last_vote (#32944) 

    * tower: when syncing from vote state, update last_vote

* pr: bubble error through unchecked

(cherry picked from commit 329c6f1)

# Conflicts:
#	programs/vote/src/vote_state/mod.rs
    @AshwinSekar @mergify
    AshwinSekar authored and mergify[bot] committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    416aa6e View commit details
    Browse the repository at this point in the history

  2. fix conflicts

    @AshwinSekar
    AshwinSekar committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    2587152 View commit details
    Browse the repository at this point in the history

  3. fix bad merge

    @AshwinSekar
    AshwinSekar committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    ce505b9 View commit details
    Browse the repository at this point in the history