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 Jan 24, 2023
1 parent a2d6f7e commit e2839be
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/networkservicemesh/sdk v0.5.1-0.20230124094906-637ce7074f92
github.com/networkservicemesh/sdk-k8s v0.0.0-20230124095537-35703ac58677
github.com/networkservicemesh/sdk-sriov v0.0.0-20230123085206-1baa83265e52
github.com/networkservicemesh/sdk-vpp v0.0.0-20230123083241-1991351c5a9e
github.com/networkservicemesh/sdk-vpp v0.0.0-20230124100008-af4f93905aef
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down Expand Up @@ -51,7 +51,7 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230123083658-0178908dd132 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230124095222-a4283d357b77 // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230124094906-637ce7074f92 h1:gjOsuk
github.com/networkservicemesh/sdk v0.5.1-0.20230124094906-637ce7074f92/go.mod h1:kKXpCya5Ps0JWUuguUjRB5l4i5vk29C381JEE67eDqs=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230124095537-35703ac58677 h1:MqdJ+gu1ndWNSU+MmUuj3AmUSaIktjjF5936uqB7mKY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230124095537-35703ac58677/go.mod h1:Y0nCW+eDDBeTAgPjtPbUMewv0d5Cgsq0zKS/+UTVn58=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230123083658-0178908dd132 h1:HxXSmw8feObAhGwq0BP9eJr8G/sfJAvuMxoLw+9vD7g=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230123083658-0178908dd132/go.mod h1:mHmFfUaKpUA/yp2GPT2sjjCJp83kD6PhCTkd3TXi10k=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230124095222-a4283d357b77 h1:08NEbSZ6jSGy6NPTMk+OHEpwt3SUvhI7JMnfn4lrkUI=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230124095222-a4283d357b77/go.mod h1:1xiGA50RA57G6z0c7g0SKTMaMSL5b3Q+9qXDscMVzfw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230123085206-1baa83265e52 h1:cEFREWKidnCkcCPmPKmiztPrGKbS7ROKwdF4xbF9Xh0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230123085206-1baa83265e52/go.mod h1:63rdciGoQjyf31dm1g7dMtsU7SxMjXXWEDUytMTB1bo=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230123083241-1991351c5a9e h1:4pweSbWtvsHj9HhDDHvXPIEN8epk7bv3Z8oGvIID7zc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230123083241-1991351c5a9e/go.mod h1:F3Sx9nWsKAGwEWYIltDLRBKzu38JeVSW0/TASVeQW7U=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230124100008-af4f93905aef h1:T7FMU+PHm0tZJhIRDkxT9VrPWgnFQ4Yxkb+5QN+OtXQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230124100008-af4f93905aef/go.mod h1:eDvBNTEPXLdb7WJKr5+OEbPEH3g6TLy4ZTJhtOt+So0=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down

0 comments on commit e2839be

Please sign in to comment.