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 Apr 1, 2022
1 parent d206598 commit 64fe677
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ require (
github.com/edwarnicke/grpcfd v1.1.2
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb
github.com/networkservicemesh/sdk v0.5.1-0.20220328192928-739e3867a1b0
github.com/networkservicemesh/sdk v0.5.1-0.20220401201557-a016280a5559
github.com/networkservicemesh/sdk-k8s v0.0.0-20220321161717-5570632d309d
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401202010-f22ec97befd2 // indirect
github.com/networkservicemesh/sdk-sriov v0.0.0-20220401201816-e1b6964ff9a8
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,14 @@ github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKue
github.com/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb h1:5047nbh591kIjLNlFrO0NbpRVkOtCGRSvkKKjQyEDyI=
github.com/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/sdk v0.5.1-0.20220321161040-57746e0ee944/go.mod h1:fK/G5mfEDIefFXxRSNXqj1jjd8SEUeZMpQUdCuc7owY=
github.com/networkservicemesh/sdk v0.5.1-0.20220328192928-739e3867a1b0 h1:QemYtGgvV4oqPts1FH4dVTTt6iFb08n0MZMGDUrWgkU=
github.com/networkservicemesh/sdk v0.5.1-0.20220328192928-739e3867a1b0/go.mod h1:fK/G5mfEDIefFXxRSNXqj1jjd8SEUeZMpQUdCuc7owY=
github.com/networkservicemesh/sdk v0.5.1-0.20220401201557-a016280a5559 h1:oxPdXmc4IQuIHnYzwRgFOInaBbwZbajD9EVKKOj1CfU=
github.com/networkservicemesh/sdk v0.5.1-0.20220401201557-a016280a5559/go.mod h1:fK/G5mfEDIefFXxRSNXqj1jjd8SEUeZMpQUdCuc7owY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220321161717-5570632d309d h1:/gstSR8BLl0hHpFgXau0zjOhIUBjO8wnLNkzqmYTh5M=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220321161717-5570632d309d/go.mod h1:4dBplYpB+qWN6+ZW/cAUtWbLULPljWQgTqaaF0ReIvg=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401200810-e777a2b489f2 h1:/28BVEikqeZsqk88z15WVWg1SuvNnLFYc2UnatrjJWc=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401200810-e777a2b489f2/go.mod h1:uNlr+0waYWxx9W/NnxBWHD9LPvjG3Ftzp5asev6Asbk=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401202010-f22ec97befd2 h1:tBowxdXBLeJI0Fy776ozBLfXBCMDvY1/HLPGhsvTR9s=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401202010-f22ec97befd2/go.mod h1:IVCfAPuyGF3M4ILcGbSlGQjhiNYuhB6/BgA8G+1HOkk=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220401201816-e1b6964ff9a8 h1:fuI266jB6uGpUxD7FiTSUnp+OMRMdmTybgKz17ySVpM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220401201816-e1b6964ff9a8/go.mod h1:wWBSyWfWWUHd3RxX49KABHruxEVKmUfi2C0CZCsEUf8=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
Expand Down

0 comments on commit 64fe677

Please sign in to comment.