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 13, 2022
1 parent 6d21938 commit 71f3b22
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.20220512163820-8c875d61945b
github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894
github.com/networkservicemesh/sdk-sriov v0.0.0-20220513014423-ade0247aaaf7
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1
github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2
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.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b h1:suJRTlWU7/N0gF3FdcN9kCf1MO5Z7CdVSBdb2JTkLhk=
github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s=
github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894 h1:J69KOXLObKnmtGaR7/uEw3PII/HqNkLwFQwdZffDdyE=
github.com/networkservicemesh/sdk v0.5.1-0.20220512164527-dc8b0c099894/go.mod h1:7Aa9sCLOVzhsbR7LBJ1nSK/YCzd/EO/YK3BbHPB0puw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512161349-4d24356e42ea/go.mod h1:JVh8X7fHtyIyP8qU8m2tLPUybbA4bTkLwHSK7hNWnDE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220513014027-1a5c14d724b1/go.mod h1:qcsOKUNPmQ1H22NHpOFuzU8ToM4NZZrYt2WmDLmd6OU=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220513014423-ade0247aaaf7 h1:Elfb1nyJP0zaSnnXKQpvc1e9NWRV0ZzS83/WQ5YZaSk=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220513014423-ade0247aaaf7/go.mod h1:GZExFojIu2iap+cqAetFFhKrDKIZFzSfzVgYdmGgpZM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1 h1:34xnI7f5eFlOitHs7bVhvbHkbuh79mJyW0fsP9VpBv4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512161740-120a9d1e98d1/go.mod h1:LK3oW8F+VYeNPCX7yyPZY/dnVqkjveH6ZemRlSkapXk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2 h1:txVIwzQYpO0FdisNA7rR9K+ldHNnUNuGQJoJ2owiRC4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220513014617-c24053ed62e2/go.mod h1:QP6BZvV9M9nr1GHnxyoJJMPysuwqG23DzhgZs1fmdfw=
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 71f3b22

Please sign in to comment.