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 Jun 27, 2022
1 parent 30751d7 commit 880a07e
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.20220627172913-3277a17f4434
github.com/networkservicemesh/sdk-k8s v0.0.0-20220627173522-dbf063517eeb
github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd
github.com/networkservicemesh/sdk-vpp v0.0.0-20220616150103-cfac383171bb
github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f
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 Expand Up @@ -49,7 +49,7 @@ require (
github.com/hashicorp/errwrap v1.0.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-20220616145656-8e32a3bae6e5 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be // indirect
github.com/open-policy-agent/opa v0.16.1 // 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 @@ -328,12 +328,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434 h1:kKiF8Z
github.com/networkservicemesh/sdk v0.5.1-0.20220627172913-3277a17f4434/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220627173522-dbf063517eeb h1:+E/N/rqOLP8NtfW+dv3uzGRF//mXK8nwjlEagahs/nY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220627173522-dbf063517eeb/go.mod h1:lNtdwh+4Vfoy/vOGv7lktNF/2EP6s9FrdnMqR/2OBcc=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5 h1:7LsDgo6RsD5Q+BHzPxvcWwOOBTGEb49De+KC2WIe9PU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220616145656-8e32a3bae6e5/go.mod h1:QPWvWoxeYHSuLYttIlgk85SZiomtN+o9Wweg2Pelc5g=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be h1:cfCCnhvwbQhSih3IJm0hmJOs+iWDvNZDOu/OZV1hzWg=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220627173312-af9e05cc82be/go.mod h1:/C+tBNuU/51ka/XuvzKb3uaUJ0unTFl0q0llNvUzzP8=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd h1:rPqW7p51fzyV8+dnCxVJNnkluIBhAPDaBkQ/t7aHpUM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220616114536-5eb8318c00cd/go.mod h1:O9H0K7+2lnf3YNhjJdK4vaiBj/8yiRazcruWMxp7ZwU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220616150103-cfac383171bb h1:WczPKwBKEWSxxcL40n05ID+k+C6PvnXJVnbUzq4mSHU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220616150103-cfac383171bb/go.mod h1:ZuUCxhFHsFM9cE4kb1ItDQ6uUmRbUZbIkuFM6kj4lOQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f h1:qk9LU3ykxi52YgEWl9mWVu5u6OxyAeLUG22isc6r3wQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220627174004-31e3bb94936f/go.mod h1:U2YhELrRw/N7UFtyE7lW8fOHxgLTosErd08C5yCZ/bQ=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
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=
Expand Down

0 comments on commit 880a07e

Please sign in to comment.