From c24bc7eb4442176812504768d3bfabd9d543e62f Mon Sep 17 00:00:00 2001 From: Network Service Mesh Bot <60070799+nsmbot@users.noreply.github.com> Date: Thu, 5 May 2022 09:12:09 -0500 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 | 2 +- go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d0a9915d..561b22cc 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20220505102418-8d6762737896 github.com/networkservicemesh/sdk-k8s v0.0.0-20220505103040-16488cbb4872 github.com/networkservicemesh/sdk-sriov v0.0.0-20220505140026-a0c110da4f69 - github.com/networkservicemesh/sdk-vpp v0.0.0-20220504135019-802bba8042ba + github.com/networkservicemesh/sdk-vpp v0.0.0-20220505140013-fdb5bed3d9fd github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index e72ce992..d831b8f0 100644 --- a/go.sum +++ b/go.sum @@ -380,18 +380,16 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5 h1:5zQY4PhShozvj/GFJS0dX6ocamAB9oWwEOJviAhGUaw= github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU= -github.com/networkservicemesh/sdk v0.5.1-0.20220504134043-5e4251adcff0/go.mod h1:G+NdPbtzcOWx1VljOj+L4kvZPQyYpiwCp84JYs+hGtc= github.com/networkservicemesh/sdk v0.5.1-0.20220505102418-8d6762737896 h1:ApKny2pqGEwxNk1LxRj/ISQOc7hXKcsuGSAACShdf70= github.com/networkservicemesh/sdk v0.5.1-0.20220505102418-8d6762737896/go.mod h1:G+NdPbtzcOWx1VljOj+L4kvZPQyYpiwCp84JYs+hGtc= github.com/networkservicemesh/sdk-k8s v0.0.0-20220505103040-16488cbb4872 h1:RUQf8m04dH/FEtMgfqm8phRq0hYnYxY+s6mOQDWLMBs= github.com/networkservicemesh/sdk-k8s v0.0.0-20220505103040-16488cbb4872/go.mod h1:+UMycFvzZ4DIa3Y82ylntwL2zjtM83LbTGfQwutYTLM= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220504134411-4a57237faf7b/go.mod h1:lzhToXkmA7YTLn7k05c4Tly+c+hl8R0eY7v1fO1X1bM= github.com/networkservicemesh/sdk-kernel v0.0.0-20220505135539-cd6d5151610b h1:yrLmDz+806gEmvvqiINGuQtzPRjGWTHp45SgpteDy94= github.com/networkservicemesh/sdk-kernel v0.0.0-20220505135539-cd6d5151610b/go.mod h1:oDYMR2sPpIhiFvtojhc3cfkwyoaK9ZXQB+dGfPRi9S8= github.com/networkservicemesh/sdk-sriov v0.0.0-20220505140026-a0c110da4f69 h1:5Gi0XKhHDAvBymjl02BVXrXAIL8N7cr74VbVtR/xhCI= github.com/networkservicemesh/sdk-sriov v0.0.0-20220505140026-a0c110da4f69/go.mod h1:JZv2kHl6t8fCgUWGYyVyekJ0jDK7rBFnGCNL+cwptQU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220504135019-802bba8042ba h1:yfmzLLHEPILGJCOR8FyPBULpHu1UimZK5Mul4ZwuPoM= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220504135019-802bba8042ba/go.mod h1:G91PySBIGRTGbP0s8sEaFaOhVPKd/qKms5Gkp/x4QnY= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220505140013-fdb5bed3d9fd h1:/Gr0Iw5z0zvnTfMD1Ur5gEaY33lpVLLwObskpgslGwo= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220505140013-fdb5bed3d9fd/go.mod h1:B53JeSz06zb4mRR2iXvM1lJaAo2n3rDdjXa0mVRZPjA= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=