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 14, 2022
1 parent 408d70b commit 52db943
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/golang/protobuf v1.5.2
github.com/google/uuid v1.2.0
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.3.2-0.20220512163820-8c875d61945b
github.com/networkservicemesh/sdk v0.5.1-0.20220513230445-b9a2a4ececad
github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce
github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e
github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed
github.com/networkservicemesh/sdk-sriov v0.0.0-20220513231555-ab6a146968f1
github.com/networkservicemesh/sdk-vpp v0.0.0-20220513145519-c850a5e4d81b
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,14 @@ github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV
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/api v1.3.2-0.20220514193644-73abc067b2ce h1:kpVCSUnoJoIy35F60F6DBuOWY+FZuVwYf3TlptLZP6k=
github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/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.20220513144854-3f01437e5b07/go.mod h1:7Aa9sCLOVzhsbR7LBJ1nSK/YCzd/EO/YK3BbHPB0puw=
github.com/networkservicemesh/sdk v0.5.1-0.20220513230445-b9a2a4ececad h1:QwUtTgHSe3fhPVqaeGmpdtV6W03eCtEc+Xr9d/tmDqA=
github.com/networkservicemesh/sdk v0.5.1-0.20220513230445-b9a2a4ececad/go.mod h1:7Aa9sCLOVzhsbR7LBJ1nSK/YCzd/EO/YK3BbHPB0puw=
github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e h1:CDM6JS8uYAlKwcY24gI2JioWe81AmLEZLBEvFwXgS3o=
github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed h1:J7xb3zHH7Ju89uxL7dZKfIGBJr4rKn7sY0jm4w7VRnA=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed/go.mod h1:EpSNe/+U2xHVti2sQzlHs3JN004Tas/dok/1Mh9+uYc=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220513145139-fac6cff68c14/go.mod h1:LW+tRe4LmfI7eLFuPkZGN+IEtLJy7kGA/uuoISnHDIo=
Expand Down

0 comments on commit 52db943

Please sign in to comment.