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 Jul 14, 2022
1 parent 121cf61 commit e69e202
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.4.1-0.20220711153918-a59689088578
github.com/networkservicemesh/sdk v0.5.1-0.20220714133727-27296edc5231
github.com/networkservicemesh/sdk-vpp v0.0.0-20220714134712-3b407ef5a48e
github.com/networkservicemesh/sdk-vpp v0.0.0-20220714130136-b2dbaeb1861d
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.20220714133727-27296edc5231 h1:2wVhFa
github.com/networkservicemesh/sdk v0.5.1-0.20220714133727-27296edc5231/go.mod h1:BF31hkvYPBmpChr4XB2l9pFWK+ySvk2y2h7IdCwqt84=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220714134107-b5f3ce186b07 h1:QhtOYlFBPFn5XbEZLMqxpZLzZR14aNLpHBXeTGXd+6U=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220714134107-b5f3ce186b07/go.mod h1:/yz7tlDXKhOekyYjNZSUBXZOJxEJFRw17CqH/YFluME=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220714134712-3b407ef5a48e h1:F9FrREB1dxPIe65V6GlrJUF+/xdSZfPGnIQVRS5jzdQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220714134712-3b407ef5a48e/go.mod h1:6pCt8QbgtSlYqnoQtQby4Cv/qMD13d/Q7AZS3nPvDj8=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220714130136-b2dbaeb1861d h1:dZKdhug2jZ3lVnDhPUBvC4tT7Vqo2B5iBwlgSqHDa1o=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220714130136-b2dbaeb1861d/go.mod h1:L0o5kFrfmu79Dvcgw5Gt5qi+4+cw42cxjI81RDGTuFY=
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 e69e202

Please sign in to comment.