From 442f83bb5ce2f4fd2a4c475dd8167bd89f183881 Mon Sep 17 00:00:00 2001 From: Network Service Mesh Bot <60070799+nsmbot@users.noreply.github.com> Date: Tue, 28 Nov 2023 06:22:35 -0600 Subject: [PATCH] =?UTF-8?q?Automatically=20resolving=20conflicts=20in=20go?= =?UTF-8?q?.mod=20and=20updating=20dependency=20v=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4564a791..b7318214 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20231128120626-c1f9028d2803 github.com/networkservicemesh/sdk-k8s v0.0.0-20231128121049-a06d88f948fa github.com/networkservicemesh/sdk-sriov v0.0.0-20231124094207-86a8285ad1ef - github.com/networkservicemesh/sdk-vpp v0.0.0-20231124094126-ac31c7ae5a1d + github.com/networkservicemesh/sdk-vpp v0.0.0-20231128121308-f6c71d1bf495 github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 @@ -58,7 +58,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/networkservicemesh/sdk-kernel v0.0.0-20231124093522-404b33c4a701 // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20231128120935-d39fc2d4950b // indirect github.com/open-policy-agent/opa v0.44.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.17.0 // indirect diff --git a/go.sum b/go.sum index e3932179..a9030d0f 100644 --- a/go.sum +++ b/go.sum @@ -167,12 +167,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20231128120626-c1f9028d2803 h1:W+m4VG github.com/networkservicemesh/sdk v0.5.1-0.20231128120626-c1f9028d2803/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s= github.com/networkservicemesh/sdk-k8s v0.0.0-20231128121049-a06d88f948fa h1:X5zdEKJevPsMUYK8P43mTHGIMQEn+FXFM+9sicYl3A4= github.com/networkservicemesh/sdk-k8s v0.0.0-20231128121049-a06d88f948fa/go.mod h1:kVo0s9tjBXNFPXrXCAyLj4mlFzozeWOesnXcJnumdUQ= -github.com/networkservicemesh/sdk-kernel v0.0.0-20231124093522-404b33c4a701 h1:RWeSA9WKvf/7t5KRxAYleHJBmMQcmMPTgke8sezhlRU= -github.com/networkservicemesh/sdk-kernel v0.0.0-20231124093522-404b33c4a701/go.mod h1:PG64vINfZyFIw0EwLaEZMzuu1Z/wSmy+yxcdI0nbpjg= +github.com/networkservicemesh/sdk-kernel v0.0.0-20231128120935-d39fc2d4950b h1:DNL9cnMlBzYpjHbBbwmzhnuRqAXqg7TojY9R7eSxd+g= +github.com/networkservicemesh/sdk-kernel v0.0.0-20231128120935-d39fc2d4950b/go.mod h1:J9C7QbMyk4m3StKJWuUn/D5yfx1/txolvR8u/pyaiA0= github.com/networkservicemesh/sdk-sriov v0.0.0-20231124094207-86a8285ad1ef h1:tOJ2rr8sL21Uz/07Kx4lJOz1qj693crXOJARZd3fwpI= github.com/networkservicemesh/sdk-sriov v0.0.0-20231124094207-86a8285ad1ef/go.mod h1:GQo6Twdrw/jvSzhCzJlJkNDVJealeAq7njc1j/z78II= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231124094126-ac31c7ae5a1d h1:PL3wnDoNAdHCvdCOGZk0kr25SdQAxwhV5h7S90zMyC8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20231124094126-ac31c7ae5a1d/go.mod h1:MwdwSFOckAQ/6AD3i9xwUvqe/trWNfrvxURFmwg0+UU= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231128121308-f6c71d1bf495 h1:oYl657m++rk5QnQtA5EQ6W9J6wg0umq5bWFx9sB9vLk= +github.com/networkservicemesh/sdk-vpp v0.0.0-20231128121308-f6c71d1bf495/go.mod h1:tLaX9CWlYzKyN2QwRJxsfwMrYHh7F69am/osmOzLzrU= github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw= github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb/go.mod h1:gHuTaUs1uFvyOY0Cy9DXvyAR2MtwmlPD2NTyYfr6kLc= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=