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 Mar 23, 2022
1 parent 84fdf65 commit 4fb8393
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 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.2.1-0.20220315001249-f33f8c3f2feb
github.com/networkservicemesh/sdk v0.5.1-0.20220321161040-57746e0ee944
github.com/networkservicemesh/sdk-sriov v0.0.0-20220323121512-9b3e8e42870e
github.com/networkservicemesh/sdk-vpp v0.0.0-20220321224401-09bb043197f0
github.com/networkservicemesh/sdk-vpp v0.0.0-20220323121605-e09c347c0a99
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-beta.10
Expand Down
5 changes: 2 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,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.20220321161040-57746e0ee944 h1:iBGlBY6den8aq5OFzUsdw08lKZoxxjxBR3UKNGAvMM0=
github.com/networkservicemesh/sdk v0.5.1-0.20220321161040-57746e0ee944/go.mod h1:fK/G5mfEDIefFXxRSNXqj1jjd8SEUeZMpQUdCuc7owY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220321161525-bf402c135e31/go.mod h1:1ba6/YHNR6jB2+5r7k0fNjsCW7mbdL/ncgrKyvYwvbc=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220323121020-854f9096edb8/go.mod h1:zWPJB4bsUGqlRxfohrzONjeujHDXH+Rz0bBLf+IuEMA=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220323121512-9b3e8e42870e h1:Th3aMvlMefHBkPyqfk4tGVPTqO/yHOnnWeHc37gBxog=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220323121512-9b3e8e42870e/go.mod h1:+9sGekH+YFxA1/24JVoPtwxZwOEmbFX4eSYKl0JR9rg=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220321224401-09bb043197f0 h1:2/XoNeWWTGSBMTtlIZEtPID0qsKh9mIl+PqeBOV4G0Y=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220321224401-09bb043197f0/go.mod h1:/epLOZnL3DLPz73LtbuWmxYSKZO39rgvhoCNlNP8b4U=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220323121605-e09c347c0a99 h1:ZPEevYPaTmQSg8Y/N2m+MaoKQy8PBYl80VvNf/MEidQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220323121605-e09c347c0a99/go.mod h1:OQTgzhu7WiO25EgluvDUkM0nr3FVSrypfSJ+ktR0fXY=
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 4fb8393

Please sign in to comment.