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 Update x/net and x/crypto/ssh into release/1.12.x #19284

Merged
merged 3 commits into from
Feb 23, 2023

Conversation

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

Backport

This PR is auto-generated from #19282 to be assessed for backporting due to the inclusion of the label backport/1.12.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.


I'll make a patch release for api and sdk once this is merged.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/bump-x-deps/mentally-suited-molly branch 2 times, most recently from 4bfa989 to 8867f29 Compare February 22, 2023 13:46
@hashicorp-cla
Copy link

hashicorp-cla commented Feb 22, 2023

CLA assistant check
All committers have signed the CLA.

@tomhjp tomhjp force-pushed the backport/bump-x-deps/mentally-suited-molly branch from bae541e to 1c5fc24 Compare February 22, 2023 14:02
@tomhjp
Copy link
Contributor

tomhjp commented Feb 22, 2023

Cherry picking failed, so I've rerun go get golang.org/x/net@latest && go get golang.org/x/crypto@latest && go mod tidy in the root, api, and sdk folders.

@tomhjp tomhjp added dependencies Pull requests that update a dependency file pr/no-changelog pr/no-milestone labels Feb 22, 2023
@tomhjp tomhjp marked this pull request as ready for review February 22, 2023 14:06
@tomhjp tomhjp requested review from cipherboy and ncabatoff and removed request for tomhjp February 22, 2023 14:08
api/go.sum Show resolved Hide resolved
@tomhjp tomhjp enabled auto-merge (squash) February 23, 2023 10:36
@tomhjp tomhjp merged commit 2e404c9 into release/1.12.x Feb 23, 2023
@tomhjp tomhjp deleted the backport/bump-x-deps/mentally-suited-molly branch February 23, 2023 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file pr/no-changelog pr/no-milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants