Skip to content

Backport of [NET-5944] security: Upgrade Go and x/net into release/1.2.x#301

Merged
zalimeni merged 1 commit into
release/1.2.xfrom
backport/zalimeni/net-5944-go-update-1.20.10/instantly-social-gnat
Oct 18, 2023
Merged

Backport of [NET-5944] security: Upgrade Go and x/net into release/1.2.x#301
zalimeni merged 1 commit into
release/1.2.xfrom
backport/zalimeni/net-5944-go-update-1.20.10/instantly-social-gnat

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #299 to be assessed for backporting due to the inclusion of the label backport/1.2.

🚨

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:
@zalimeni
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/consul-dataplane/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Upgrade to Go 1.20.10 and x/net 1.17.0 to resolve CVE-2023-39325 / CVE-2023-44487.

See hashicorp/consul#19225 for detailed links.

Change will be backported to all (1.0.x-1.2.x) release branches with future releases scheduled. This will likely also be a manual backport to 1.3.0 GA and 1.3.x depending on branch cut timing.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/instantly-social-gnat branch from 06c1466 to 3b18e8d Compare October 16, 2023 21:58
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/instantly-social-gnat branch from 3b18e8d to 06c1466 Compare October 16, 2023 21:58
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Oct 16, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@zalimeni zalimeni marked this pull request as ready for review October 18, 2023 13:10
@zalimeni zalimeni requested a review from a team as a code owner October 18, 2023 13:10
@zalimeni zalimeni force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/instantly-social-gnat branch from f6db6bf to 653af83 Compare October 18, 2023 13:10
@zalimeni zalimeni enabled auto-merge (squash) October 18, 2023 13:10
@zalimeni zalimeni merged commit 47a873d into release/1.2.x Oct 18, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-5944-go-update-1.20.10/instantly-social-gnat branch October 18, 2023 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants