Skip to content

Commit

Permalink
Automatically resolving conflicts in go.mod and updating dependency v…
Browse files Browse the repository at this point in the history
  • Loading branch information
nsmbot authored Jun 2, 2022
1 parent d2ef113 commit 836920c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab
github.com/networkservicemesh/sdk v0.5.1-0.20220602004728-9998b77fcb6b
github.com/networkservicemesh/sdk-k8s v0.0.0-20220530212608-9aea487db189
github.com/networkservicemesh/sdk-sriov v0.0.0-20220530170053-743aee94352e
github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6
github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ github.com/networkservicemesh/sdk-k8s v0.0.0-20220530212608-9aea487db189 h1:hMmY
github.com/networkservicemesh/sdk-k8s v0.0.0-20220530212608-9aea487db189/go.mod h1:wPMD0BREsDwf5x9fnmD5p7XGbl5Jh6bVxanKlGuOVg4=
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-sriov v0.0.0-20220530170053-743aee94352e h1:Us3bfsSSWuY1OLuvo41CqcpWYZdpD4fxkTmqBCJu758=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220530170053-743aee94352e/go.mod h1:SJg5PqFtbGnxExobf2zPHs3lM0HEHK3T00q2p9swKwE=
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=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893/go.mod h1:iWbQWhFTp2kMnSU2iIjQ6Euwu/l5od7DCfHaqzimJf4=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
Expand Down

0 comments on commit 836920c

Please sign in to comment.