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 golang/x/net into release/1.10.x #18485

Merged

Conversation

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

Backport

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


go get -u golang.org/x/net && go mod tidy


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Dec 19, 2022

CLA assistant check
All committers have signed the CLA.

@mpalmi mpalmi force-pushed the backport/update-x-net-context/actively-valued-kid branch from 2864f0e to 3732930 Compare December 19, 2022 22:55
@mpalmi mpalmi marked this pull request as ready for review December 19, 2022 22:55
@mpalmi mpalmi added this to the 1.10.10 milestone Dec 19, 2022
@mpalmi
Copy link
Contributor

mpalmi commented Dec 19, 2022

Accidentally had the wrong version of go in my path. Updates coming.

mpalmi and others added 3 commits December 19, 2022 18:03
* Update gopsutil to v3

* Adds v2 field names in host-info response to allow eventual deprecation in favor of v3 field names

* Map v3 to v2 field names to keep host-info api compat

* copy gopsutil license into source

* bump klog version to fix builds
@mpalmi mpalmi enabled auto-merge (squash) December 20, 2022 14:02
@mpalmi mpalmi disabled auto-merge December 20, 2022 14:03
Copy link
Contributor

@cipherboy cipherboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume the additional version bumps are because some deps required older net/... versions and thus we needed to bump them too?

Copy link
Contributor

@austingebauer austingebauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The gopsutil backport LGTM.

@mpalmi mpalmi merged commit fe392b0 into release/1.10.x Dec 20, 2022
@mpalmi mpalmi deleted the backport/update-x-net-context/actively-valued-kid branch December 20, 2022 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants