From 1db5c8427733b4c825e565645f9d21558e341ca8 Mon Sep 17 00:00:00 2001 From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 11:12:25 -0500 Subject: [PATCH] Cherry-pick 1355baef0a370628f23d24123f003c3e36660c7f with conflicts --- go.mod | 6 ++++++ go.sum | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/go.mod b/go.mod index 7a6ae375c4b..b942cce6e88 100644 --- a/go.mod +++ b/go.mod @@ -71,9 +71,15 @@ require ( go.etcd.io/etcd/client/v3 v3.5.12 go.uber.org/mock v0.2.0 golang.org/x/crypto v0.31.0 // indirect +<<<<<<< HEAD golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 golang.org/x/oauth2 v0.18.0 +======= + golang.org/x/mod v0.22.0 // indirect + golang.org/x/net v0.33.0 + golang.org/x/oauth2 v0.24.0 +>>>>>>> 1355baef0a (Bump golang.org/x/net from 0.31.0 to 0.33.0 (#17416)) golang.org/x/sys v0.28.0 golang.org/x/term v0.27.0 golang.org/x/text v0.21.0 // indirect diff --git a/go.sum b/go.sum index ab1d84608ee..dbde5a21ede 100644 --- a/go.sum +++ b/go.sum @@ -599,9 +599,14 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +<<<<<<< HEAD golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +======= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +>>>>>>> 1355baef0a (Bump golang.org/x/net from 0.31.0 to 0.33.0 (#17416)) golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=