Automatically resolving conflicts in go.mod and updating dependency v…

networkservicemesh · May 5, 2022 · 5750c65 · 5750c65
1 parent 055fba4
commit 5750c65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5
 	github.com/networkservicemesh/sdk v0.5.1-0.20220505102418-8d6762737896
-	github.com/networkservicemesh/sdk-sriov v0.0.0-20220504134851-545a79cf58b3
+	github.com/networkservicemesh/sdk-sriov v0.0.0-20220505103434-6e176f2d8bc4
 	github.com/networkservicemesh/sdk-vpp v0.0.0-20220505103110-6a3a626a2f17
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1

diff --git a/go.sum b/go.sum
@@ -199,13 +199,11 @@ 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-kernel v0.0.0-20220504134411-4a57237faf7b/go.mod h1:lzhToXkmA7YTLn7k05c4Tly+c+hl8R0eY7v1fO1X1bM=
 github.com/networkservicemesh/sdk-kernel v0.0.0-20220505102750-b3ec72b7dfa8/go.mod h1:oDYMR2sPpIhiFvtojhc3cfkwyoaK9ZXQB+dGfPRi9S8=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20220504134851-545a79cf58b3 h1:1q+P3iNFBF+AUwtEva9HID9XPJrXGf3mSXsg9tEsT+s=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20220504134851-545a79cf58b3/go.mod h1:dmH96QH8vTLL+BxrFJWF9KGT86nh1/dd3BI2e67opxE=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20220505103434-6e176f2d8bc4 h1:M5GMRi+TY6uOel4XyypUpc/OOjxKCT1SpdLQlo5/6M8=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20220505103434-6e176f2d8bc4/go.mod h1:aCkxTJEL+xKqDMTUoLfLV/gvmFG9i36PxfJor//yCcQ=
 github.com/networkservicemesh/sdk-vpp v0.0.0-20220505103110-6a3a626a2f17 h1:R5b+sEC1MlvMEoxaTdt3WIJSo6tfzsDD46AkzxDUU04=
 github.com/networkservicemesh/sdk-vpp v0.0.0-20220505103110-6a3a626a2f17/go.mod h1:ZDXqpavUuPLlMm5wI87B+E+P7ibiru5PB/V9sQrhows=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=