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 Revert "Implement user lockout log (#23140)" into release/1.14.x #23765

Conversation

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

Backport

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

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@davidadeleon
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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.


This reverts commit 92fcfda.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/davidadeleon/revert-lockout-logger/suitably-super-halibut branch from 867517a to 15138b9 Compare October 20, 2023 15:21
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 20, 2023

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Oct 20, 2023
@github-actions
Copy link

github-actions bot commented Oct 20, 2023

CI Results:
Failures:

Test Type Package Test Logs
race builtin/logical/consul TestBackend_Config_Access view test results
race builtin/logical/consul TestBackend_Config_Access/config_access view test results
race builtin/logical/consul TestBackend_Config_Access/config_access/pre-1.4.0 view test results
race builtin/logical/consul TestBackend_Config_Access/config_access/pre-1.4.0_automatic-bootstrap view test results
race builtin/logical/pkiext Test_ZLintECDSA256 view test results
race builtin/logical/pkiext Test_ZLintECDSA384 view test results
race builtin/logical/pkiext Test_ZLintECDSA521 view test results
race builtin/logical/pkiext Test_ZLintRSA2048 view test results
race builtin/logical/pkiext Test_ZLintRSA2048PSS view test results
race builtin/logical/pkiext Test_ZLintRSA3072 view test results

and 11 other tests

@ryancragun ryancragun marked this pull request as ready for review October 20, 2023 16:53
@ryancragun ryancragun closed this Oct 20, 2023
@ryancragun ryancragun force-pushed the backport/davidadeleon/revert-lockout-logger/suitably-super-halibut branch from 208a474 to fd4b2e6 Compare October 20, 2023 16:54
@ryancragun ryancragun enabled auto-merge (squash) October 20, 2023 17:03
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@ryancragun ryancragun merged commit e83f62d into release/1.14.x Oct 25, 2023
95 checks passed
@ryancragun ryancragun deleted the backport/davidadeleon/revert-lockout-logger/suitably-super-halibut branch October 25, 2023 15:38
@cinthiaconti cinthiaconti added this to the 1.14.6 milestone Oct 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants