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 7, 2022
1 parent 51f7a7d commit beb2ce8
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 @@ -12,7 +12,7 @@ require (
github.com/networkservicemesh/api v1.6.2-0.20221205183940-84c7ff837cdd
github.com/networkservicemesh/sdk v0.5.1-0.20221207123638-d94a145092d6
github.com/networkservicemesh/sdk-sriov v0.0.0-20221207124525-b338d7862b4d
github.com/networkservicemesh/sdk-vpp v0.0.0-20221207123745-fd5a48d5e678
github.com/networkservicemesh/sdk-vpp v0.0.0-20221206112452-c9d7291b5e3b
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20221207123638-d94a145092d6 h1:d/HQEc
github.com/networkservicemesh/sdk v0.5.1-0.20221207123638-d94a145092d6/go.mod h1:zEYFbCVXGlTT5f0x6sx8XtL2GazkYBpCoEpooxkz2vE=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221207124525-b338d7862b4d h1:XFJGFPq1N95gI82jmaaVMV4tvO0o1MzDfwkaldH74E8=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221207124525-b338d7862b4d/go.mod h1:t7pKsk7m6jEYf+qzF3BL1vjgNa+TcI2NBDOE1K/Y4fM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221207123745-fd5a48d5e678 h1:Xk7pd1pG/odxtxtUOhQVvkqllJgL9TGYX8hJxGH1pEE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221207123745-fd5a48d5e678/go.mod h1:xxGbPoFYXSZXvGu1c4BGNhyQfucl76aPdFAayjtBHVk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221206112452-c9d7291b5e3b h1:tJrY7VBHaTc6u5BLh3w1cPs362eiSD/dbTxdEWSDVSM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221206112452-c9d7291b5e3b/go.mod h1:9XCG5+2GxZs2jN9PkQb08iQ2Qg1mx22/OTbtLhpbcxc=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down

0 comments on commit beb2ce8

Please sign in to comment.