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

Backport of Update vault-plugin-secrets-openldap to v0.12.1 into release/1.15.x #25531

Merged
merged 1 commit into from
Feb 20, 2024
Merged

Backport of Update vault-plugin-secrets-openldap to v0.12.1 into release/1.15.x #25531

merged 1 commit into from
Feb 20, 2024

Conversation

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

Backport

This PR is auto-generated from #25524 to be assessed for backporting due to the inclusion of the label backport/1.15.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:
@raymonstah
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 PR was generated by a GitHub Action. Full log: https://github.com/hashicorp/vault/actions/runs/7977649077

Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/update/vault-plugin-secrets-openldap/v0.12.1/absolutely-sharp-gibbon branch from ea2f262 to bad60ba Compare February 20, 2024 18:46
@hashicorp-cla
Copy link

hashicorp-cla commented Feb 20, 2024 •
edited
Loading

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 Feb 20, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 20, 2024 •
edited
Loading

CI Results:
All Go tests succeeded! ✅

@raymonstah raymonstah added this to the 1.15.6 milestone Feb 20, 2024
@raymonstah raymonstah marked this pull request as ready for review February 20, 2024 18:56
@raymonstah raymonstah enabled auto-merge (squash) February 20, 2024 18:59
@github-actions GitHub Actions
Copy link

Build Results:
All builds succeeded! ✅

@raymonstah raymonstah force-pushed the backport/update/vault-plugin-secrets-openldap/v0.12.1/absolutely-sharp-gibbon branch from 48e43df to a940035 Compare February 20, 2024 20:48
@raymonstah raymonstah enabled auto-merge (squash) February 20, 2024 20:48
@raymonstah raymonstah merged commit 074dad7 into release/1.15.x Feb 20, 2024
76 checks passed
@raymonstah raymonstah deleted the backport/update/vault-plugin-secrets-openldap/v0.12.1/absolutely-sharp-gibbon branch February 20, 2024 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raymonstah raymonstah raymonstah approved these changes

Assignees
No one assigned
Labels
hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed
Projects
None yet
Milestone
1.15.6
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-secure-vault-core @hashicorp-cla @raymonstah