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

Backport of Prevent autopilot from demoting voters when they join a 2nd time into release/1.11.x #18332

Conversation

hc-github-team-secure-vault-core
Copy link
Contributor

Backport

This PR is auto-generated from #18263 to be assessed for backporting due to the inclusion of the label backport/1.11.x.

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: POST https://api.github.com/repos/hashicorp/vault/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


OSS part of https://github.com/hashicorp/vault-enterprise/pull/3395


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Dec 13, 2022

CLA assistant check
All committers have signed the CLA.

@ncabatoff ncabatoff force-pushed the backport/prevent-autopilot-demotions-oss/vaguely-sure-tapir branch from abde9cf to 9004655 Compare December 13, 2022 14:46
@ncabatoff ncabatoff marked this pull request as ready for review December 13, 2022 14:46
@ncabatoff ncabatoff enabled auto-merge (squash) December 13, 2022 14:47
@ncabatoff ncabatoff merged commit c060f82 into release/1.11.x Dec 13, 2022
@ncabatoff ncabatoff deleted the backport/prevent-autopilot-demotions-oss/vaguely-sure-tapir branch December 15, 2022 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants