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

networkservicemesh · Apr 2, 2024 · c2dc8f2 · c2dc8f2
1 parent 8f5b4d9
commit c2dc8f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba
 	github.com/networkservicemesh/sdk v0.5.1-0.20240402094855-f0105d638501
 	github.com/networkservicemesh/sdk-sriov v0.0.0-20240402095822-3395f55880b4
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20240328112356-7adee3b2cd34
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20240402095832-0937af407f93
 	github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3

diff --git a/go.sum b/go.sum
@@ -120,8 +120,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240402094855-f0105d638501 h1:QNWsdm
 github.com/networkservicemesh/sdk v0.5.1-0.20240402094855-f0105d638501/go.mod h1:kSPLlf71rqB+4mAW8MHkrfWs9cMuQJP7RVkGqpHqKmY=
 github.com/networkservicemesh/sdk-sriov v0.0.0-20240402095822-3395f55880b4 h1:2J4Ne8q77vMaLIu36vh8BACIqPticUamX5zDq+WXzZY=
 github.com/networkservicemesh/sdk-sriov v0.0.0-20240402095822-3395f55880b4/go.mod h1:HfnimMAHeq81ZoeLqtjTRpjd73usBltbfT+J2ZVhlNI=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20240328112356-7adee3b2cd34 h1:qQfUG8yJsAKyIoTTeiA0dhf1XmTRdSG1/KEif9mRx9s=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20240328112356-7adee3b2cd34/go.mod h1:SWEl7XEhPArOU0uq6Z34aATre3znbXguvdWcrKtj9gc=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20240402095832-0937af407f93 h1:B/kKbbhKgeZKMaRLT0OzHqOQD1CtVEutSA2KUWoodDk=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20240402095832-0937af407f93/go.mod h1:shEtTHtpRsiKYoA7beWPTYHm/ntAwNCU1ebmC0we8bY=
 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=
 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM=
 github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=