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 hashicorp/vault-plugin-secrets-mongodbatlas to v0.10.2 into release/1.14.x #23851

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Backport of Update hashicorp/vault-plugin-secrets-mongodbatlas to v0.10.2 into release/1.14.x #23851

merged 2 commits into from
Oct 26, 2023

Conversation

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

Backport

This PR is auto-generated from #23849 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:
@ltcarbonell
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/6654356604

Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/update/hashicorp/vault-plugin-secrets-mongodbatlas/v0.10.2/scarcely-easy-seasnail branch from b96e941 to 56d3c2c Compare October 26, 2023 13:24
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 26, 2023 •
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 Oct 26, 2023
@ltcarbonell ltcarbonell force-pushed the backport/update/hashicorp/vault-plugin-secrets-mongodbatlas/v0.10.2/scarcely-easy-seasnail branch from 0a2d819 to 8d175a8 Compare October 26, 2023 13:36
@ltcarbonell ltcarbonell marked this pull request as ready for review October 26, 2023 13:36
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@hc-github-team-secure-vault-core @hc-github-team-secure-vault-ecosystem @ltcarbonell
Update hashicorp/vault-plugin-secrets-mongodbatlas to v0.10.2 (#23849)
132cc6d 
* Automated dependency upgrades

* Add changelog

---------

Co-authored-by: hc-github-team-secure-vault-ecosystem <hc-github-team-secure-vault-ecosystem@users.noreply.github.com>
@ltcarbonell ltcarbonell force-pushed the backport/update/hashicorp/vault-plugin-secrets-mongodbatlas/v0.10.2/scarcely-easy-seasnail branch from 8d175a8 to 132cc6d Compare October 26, 2023 13:42
@github-actions
Copy link

CI Results:
All Go tests succeeded! ✅

@ltcarbonell ltcarbonell merged commit 340e292 into release/1.14.x Oct 26, 2023
98 of 99 checks passed
@ltcarbonell ltcarbonell deleted the backport/update/hashicorp/vault-plugin-secrets-mongodbatlas/v0.10.2/scarcely-easy-seasnail branch October 26, 2023 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ltcarbonell ltcarbonell ltcarbonell approved these changes

@fairclothjm fairclothjm fairclothjm 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
No milestone
Development

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