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 3, 2022
1 parent a195134 commit 3b43707
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 @@ -10,7 +10,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab
github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e
github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3
github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0
google.golang.org/grpc v1.42.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,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-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-vpp v0.0.0-20220603151507-f38df88434f3 h1:YnFjPBeoXJZBbLXU+rOpEjLKEbI5UbZRscfcLjqhY60=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3/go.mod h1:lF+eq/4v/WseGyJqIGHep8OOgFUfC3jDRP4+IT70uNc=
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/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 3b43707

Please sign in to comment.