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 Dec 16, 2022
1 parent d5ecf7b commit b01e1e6
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.6.2-0.20221205183940-84c7ff837cdd
github.com/networkservicemesh/sdk v0.5.1-0.20221216223505-3057cfc335ca
github.com/networkservicemesh/sdk-k8s v0.0.0-20221215124604-aa6adb94559d
github.com/networkservicemesh/sdk-sriov v0.0.0-20221215124627-fd661768f0e5
github.com/networkservicemesh/sdk-sriov v0.0.0-20221216224511-6d46975dc8ac
github.com/networkservicemesh/sdk-vpp v0.0.0-20221216224321-5a6a13540d2d
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ github.com/networkservicemesh/sdk-k8s v0.0.0-20221215124604-aa6adb94559d h1:3N2s
github.com/networkservicemesh/sdk-k8s v0.0.0-20221215124604-aa6adb94559d/go.mod h1:HwfZIVQkQzQbD988duCcu7Q+Nc7FxKhhClpqfi5GYoA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20221216223852-a6e924f8aebb h1:JY0zxwE/vgXofjZFIEkP5V7X6Kasji4wRKx7Xqmhf5E=
github.com/networkservicemesh/sdk-kernel v0.0.0-20221216223852-a6e924f8aebb/go.mod h1:tXAljNDZ/6aP4aNuMPzQ1GgbSkaIZDy3bhvzz8OFHVw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221215124627-fd661768f0e5 h1:lrfhxhBA62b7dCdEhDksqPaJJ2NhSASkW3o0PWr25u4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221215124627-fd661768f0e5/go.mod h1:Rmbl48yL+bvQ1WyT7FMLtkvOowSPWfztLeNj5LZx+DQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221216224511-6d46975dc8ac h1:ZVqSPaJw8RYS8r7qfM8ylW6xRl4GnU+0XkL5TwCj54A=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221216224511-6d46975dc8ac/go.mod h1:tLgELZqJaKvJm4eb5KG+XjflNk516Q8v4a0xWP+MDc4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221216224321-5a6a13540d2d h1:FeCGg2wFMZxJWMB4hSEfYmHezmUOFWXJp/Iy4eQDE5A=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221216224321-5a6a13540d2d/go.mod h1:j2Nf8VutPRpWi2wmiCaX1KkvYB4tUWtAv22X58NX5WA=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down

0 comments on commit b01e1e6

Please sign in to comment.