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 12, 2022
1 parent 6ae3175 commit 67e4bdc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351
github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f
github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
Expand Down
8 changes: 2 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,13 @@ 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.0-rc.1.0.20220405210054-fbcde048efa5/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/api v1.3.2-0.20220509143420-a1414febd727/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI=
github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20220507173809-41196bdf49db/go.mod h1:G+NdPbtzcOWx1VljOj+L4kvZPQyYpiwCp84JYs+hGtc=
github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18 h1:gHQmGN6YFwGWkM7cxrUuB1BV2L0qvPkkyIl/Cq19gtw=
github.com/networkservicemesh/sdk v0.5.1-0.20220512021617-3a175e308a18/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220510150403-cc7b4d965fb6/go.mod h1:7P9uNVVtXkhOW5nAnWBax24uadOCtmXLxMbgpm/7WrY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220512022255-0d391d1796e5/go.mod h1:U+mFUYf5bwyQzlJnNu5crGv9qF4M9MbCks0iKmNBJNg=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f h1:gP9pQRxm+Q7wtxxK5dLbJdFY1ALhRKHVArjkdsc2cQM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220510150855-21e6cc08ac8f/go.mod h1:Nah/iZKTvzKomjQalZ0p/NgCDo9eTiFSDPeQLo+lGuc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b h1:9RJC1InBV4P1feo+DxRfb22yyRB6zy27KoPwVyY7T84=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220512022911-50b8198bc90b/go.mod h1:igDwkyjuNFKqQPaREIPUiE9cZYdg1SB/SO8Uyn8zh8Q=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02 h1:Yn9DxwCF/peF+M9n+AuCELMZeESf+x6vwyttU8pWLcc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220512022856-b9764ec31a02/go.mod h1:B5XXx8QQg4IMEKHDHKT1MTpkOnAnjrbn07tfkx6Pogg=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down

0 comments on commit 67e4bdc

Please sign in to comment.