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 May 16, 2022
1 parent 71e2186 commit 78288df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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.3.2-0.20220516230921-edaa6f46d6ab
github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b
github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f
github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down
7 changes: 2 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,15 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4
github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0=
github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA=
github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20220514221142-f0081c8f06e7/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s=
github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b h1:EbnWQCZGG+MFirJabvwa63634xfG+YW3afwlZ6jSq3g=
github.com/networkservicemesh/sdk v0.5.1-0.20220516231803-58c8ced2925b/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220514221352-3784157959aa/go.mod h1:E1/WQNkn5mr18X/FelzSHXRnMlZ3Gqdg/hUMj0r/kLA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220516232340-6fad2237ad6d/go.mod h1:qXoFH5jKCSsoSqeV1YZ9pX0p1WFj+4CqAUqeSstqx98=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356 h1:sKdv/KpHmVk3uOauIX9CgoJCZD1PCQXbxxJY/FGumI4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220516232725-8d2333e19356/go.mod h1:by4zw8EV6H85gZUjHYpjBRpmtfivCTTx8Hyu+le9t7w=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f h1:lKVoW4sHgmVPChgn8hRI8wMjhnyjxYWJqfzm+jKue68=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220514221738-3c81ea598a7f/go.mod h1:zbwQvuHL10dfH+oJ1pyT+Wk4RAVuTyW5k1RH281n3ME=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145 h1:WFGr59Cbc+dxu6LDpQqmFNZnadK38bvjH8HnPu18pHU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220516232748-13cfcde06145/go.mod h1:vSZF4U/PbbR25Fomp3NBQYP1RZo9z13IQ0g5QJWQ1jw=
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 78288df

Please sign in to comment.