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

networkservicemesh · Jun 3, 2022 · 41a95df · 41a95df
1 parent d029dd0
commit 41a95df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -49,7 +49,7 @@ require (
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
-	github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690 // indirect
+	github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f // indirect
 	github.com/open-policy-agent/opa v0.16.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect

diff --git a/go.sum b/go.sum
@@ -328,8 +328,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e h1:3LqWbi
 github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20220603151217-f79531436eb1 h1:ZhahI4ZiCoTUtXUVw4VdsLns7qIe975oHX9UCQIJ0Cg=
 github.com/networkservicemesh/sdk-k8s v0.0.0-20220603151217-f79531436eb1/go.mod h1:gxSkZDo8gyQZjGtvTQbrDG83pd/dOXTA+Y+6j3Fqh9M=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690 h1:nMTbmdoKRM185U2TFyPHtSh+G+BT7w2q+owhTDlKBbg=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690/go.mod h1:PhvNG1KMMYEv6KbiXmc4FQgtkn1dtOIvWW8SF1uTolU=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f h1:g1FXEvoiLP220l1faA7JDLOaV56Cq1Vz5K7G8DPiSZ8=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f/go.mod h1:xukX7XZOUQpnLG9df5bckNk3r9Is9kPXTtkUwuWk7qw=
 github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6 h1:kMCepMg8gLUC/tgTn3QbZmLmFOjCkcs7sp+wITIkO4A=
 github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6/go.mod h1:cm78VFqyYtJST+nJVlJqXFMofL3LQcqtGc1gYiNp/f8=
 github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893 h1:jg6BP78jPKK0b25dBns3S60NFGgGFKPkrV36OEHR15M=