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

Handle VoteStateUpdates for outdated roots bigger than slots in existing VoteState (backport #27323) #27391

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2022

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

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

You are currently cherry-picking commit ad6c2d8c5.
  (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:   programs/vote/src/vote_state/mod.rs
	both modified:   sdk/src/feature_set.rs

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

…ing VoteState (#27323)

* Set root to latest vote in tower <= prposed vote state

* fixup tests

* PR comments

* feature gate

(cherry picked from commit ad6c2d8)

# Conflicts:
#	programs/vote/src/vote_state/mod.rs
#	sdk/src/feature_set.rs
@mergify mergify bot added the conflicts label Aug 25, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 25, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 25, 2022
@carllin carllin closed this Aug 26, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-27323 branch August 26, 2022 02:40
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.

1 participant