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 21, 2022
1 parent 7adb337 commit 9211772
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 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/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb
github.com/networkservicemesh/sdk v0.5.1-0.20220321161040-57746e0ee944
github.com/networkservicemesh/sdk-k8s v0.0.0-20220321161717-5570632d309d
github.com/networkservicemesh/sdk-sriov v0.0.0-20220314174029-8ee6d6181d09
github.com/networkservicemesh/sdk-sriov v0.0.0-20220321162041-ef9a01fc0cda
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-alpha.4.0.20200528145730-dc11d0c74e85
Expand Down
10 changes: 4 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -351,18 +351,16 @@ 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.2.1-0.20220314135017-fe3ca7556bdc/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
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.20220314173321-130992f19d87/go.mod h1:f/f0fiMhDclV4yNwsU0r4mc94Onq+EhLKZc5SOhpQgA=
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-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-20220314173549-613436de9ab3 h1:68fn98thWlKQx42n0zDNbeAAU8+FqHS5uGlbIPNObbY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220314173549-613436de9ab3/go.mod h1:bQ7VrJlqjSAxF4o8vaeTO82EuUEP+Blfa13XBD9ijq4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220314174029-8ee6d6181d09 h1:uBGp8clCteS/cKsVl2rq5yc5YwLQgan7kLyXEh4mftQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220314174029-8ee6d6181d09/go.mod h1:Oa2ZyplOs5wDAHd5X0g7Sn+dlfY04PUlj/57Gfmr1MU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220321161525-bf402c135e31 h1:m6QErGiUT3V6VfH6BhKZNdTZoOabWr1CHnliUhxW3zA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220321161525-bf402c135e31/go.mod h1:1ba6/YHNR6jB2+5r7k0fNjsCW7mbdL/ncgrKyvYwvbc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220321162041-ef9a01fc0cda h1:V1VlbkcmEtJigpQ7VblJfgeCqtUj70D7Wg5s1K2CCic=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220321162041-ef9a01fc0cda/go.mod h1:KS8npYaQY0tc9ZlJAEeqnqmZvFVB3ncZXQ17BH4R8OY=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down

0 comments on commit 9211772

Please sign in to comment.