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
…ersions to the latest

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
  • Loading branch information
NSMBot committed Apr 1, 2022
1 parent 2f35db8 commit 519b19b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ require (
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-vpp v0.0.0-20220401201837-7f48c9107fd4
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401200810-e777a2b489f2 // indirect
github.com/networkservicemesh/sdk-vpp v0.0.0-20220401201126-70eceb7cf39c
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-beta.4
google.golang.org/grpc v1.42.0
Expand Down
5 changes: 3 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,11 @@ github.com/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb h1:5047nb
github.com/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
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-kernel v0.0.0-20220328193242-a7872b5227b3/go.mod h1:uNlr+0waYWxx9W/NnxBWHD9LPvjG3Ftzp5asev6Asbk=
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-vpp v0.0.0-20220401201837-7f48c9107fd4 h1:f8Sdbf2zrk1ztS+aJX28sBaTkmUVFn/o2GEqIrl3eYI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220401201837-7f48c9107fd4/go.mod h1:xa3j93B+X2vrXRCFtqNAVCQunqpj6sLjbLds1SlDib0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220401201126-70eceb7cf39c h1:Xkxf7xYIg3oUNIgyuqL5GZ4rXVYI4yF3S0oJ3CzAhrA=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220401201126-70eceb7cf39c/go.mod h1:Nox5/EDUx1IH1P/YK1V4+AvBc+jmbsndBQzgBeoskuA=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand Down

0 comments on commit 519b19b

Please sign in to comment.