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 15, 2022
1 parent bc7b69f commit 7f8b7a9
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.20221215123931-9709ed4b3fb8
github.com/networkservicemesh/sdk-sriov v0.0.0-20221215124627-fd661768f0e5
github.com/networkservicemesh/sdk-vpp v0.0.0-20221215100206-0dfa64cabacf
github.com/networkservicemesh/sdk-vpp v0.0.0-20221215124653-c0502623c00f
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.20221215123931-9709ed4b3fb8 h1:E6YXsY
github.com/networkservicemesh/sdk v0.5.1-0.20221215123931-9709ed4b3fb8/go.mod h1:zEYFbCVXGlTT5f0x6sx8XtL2GazkYBpCoEpooxkz2vE=
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-vpp v0.0.0-20221215100206-0dfa64cabacf h1:UEUmQlB4TSqFQdifDv0/rWKUwT/UhW4ug1XT/q+DpIA=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221215100206-0dfa64cabacf/go.mod h1:UYCB5yY8Vr4kfYtZswJfX4OmhxYIhygf1Udjgor0W70=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221215124653-c0502623c00f h1:VCUSLidlhElfB/fdUXabUVlYAS/2rrvMDB/x5Ckivgc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221215124653-c0502623c00f/go.mod h1:jRy/rEDU7bdFV2k6txL+rJSmyyBBinAPCbgMCZlbotY=
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 7f8b7a9

Please sign in to comment.