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-ad to v0.16.2 into release/1.15.x #25062

Merged
merged 4 commits into from
Jan 25, 2024
Merged

Backport of Update vault-plugin-secrets-ad to v0.16.2 into release/1.15.x #25062

merged 4 commits into from
Jan 25, 2024

Conversation

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

Backport

This PR is auto-generated from #25058 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:
@Zlaticanin
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/7647363221

Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/update/vault-plugin-secrets-ad/v0.16.2/needlessly-suited-hare branch from 85b5c42 to e77923f Compare January 24, 2024 23:24
@hashicorp-cla
Copy link

hashicorp-cla commented Jan 24, 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 Jan 24, 2024
@Zlaticanin Zlaticanin added this to the 1.15.5 milestone Jan 24, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 24, 2024 •
edited
Loading

CI Results:
All Go tests succeeded! ✅

@hc-github-team-secure-vault-core @hc-github-team-secure-vault-ecosystem @Zlaticanin
Update vault-plugin-secrets-ad to v0.16.2 (#25058)
fbc2803 
* Automated dependency upgrades

* Add changelog

---------

Co-authored-by: hc-github-team-secure-vault-ecosystem <hc-github-team-secure-vault-ecosystem@users.noreply.github.com>
@Zlaticanin Zlaticanin force-pushed the backport/update/vault-plugin-secrets-ad/v0.16.2/needlessly-suited-hare branch from 513b43d to fbc2803 Compare January 25, 2024 00:32
@Zlaticanin Zlaticanin requested a review from raymonstah January 25, 2024 00:35
@Zlaticanin Zlaticanin marked this pull request as ready for review January 25, 2024 00:37
@github-actions GitHub Actions
Copy link

Build Results:
All builds succeeded! ✅

@Zlaticanin Zlaticanin merged commit 72c0fa3 into release/1.15.x Jan 25, 2024
103 checks passed
@Zlaticanin Zlaticanin deleted the backport/update/vault-plugin-secrets-ad/v0.16.2/needlessly-suited-hare branch January 25, 2024 19:48
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.5
Development

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