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

…ersions to the latest Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
networkservicemesh · Mar 25, 2024 · d4316f2 · d4316f2
1 parent d0c840d
commit d4316f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985
 	github.com/networkservicemesh/govpp v0.0.0-20240312165607-3c0a753ca3bf
 	github.com/networkservicemesh/sdk v0.5.1-0.20240325095750-d803d102cac5
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20240325113151-9bfbe3b71cc3
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20240325111600-d391ce1daf19
 	github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3

diff --git a/go.sum b/go.sum
@@ -156,8 +156,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240325095750-d803d102cac5 h1:+ynDZ1
 github.com/networkservicemesh/sdk v0.5.1-0.20240325095750-d803d102cac5/go.mod h1:sX3yHOgF+zgPv22w77yrldRkR3m7plBNPaTj9nuhP+s=
 github.com/networkservicemesh/sdk-kernel v0.0.0-20240325112637-39595ce194c5 h1:fdwGjtIzQA0M9TEaZY67PuZY7lkqPA5y6rJG0YoJ+J8=
 github.com/networkservicemesh/sdk-kernel v0.0.0-20240325112637-39595ce194c5/go.mod h1:CM+3dmDENTnE0Bca2Vu5kKW/ROvCUCaiJskKjPyWS/k=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20240325113151-9bfbe3b71cc3 h1:iXHYJBQz85GbO8gezRmKiIp3UK/B6v0TRLonPqTf1sA=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20240325113151-9bfbe3b71cc3/go.mod h1:dfUZQQskcdLqIAUU+2LSBlgQx/jpih2Iu0T1Ghgqmlc=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20240325111600-d391ce1daf19 h1:8fAT+1Hp/FimJt5QX6Ov+S1N0FkvdrsdThqJgSEcv+0=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20240325111600-d391ce1daf19/go.mod h1:VmddU2NAp6nsMcjftwjru33Eu17eEvj5Ri8QirpNBuo=
 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=