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 Nov 23, 2023
1 parent 420ef41 commit fe97eed
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.20231123111633-d10933795bd9
github.com/networkservicemesh/sdk-k8s v0.0.0-20231123112133-3a307c41ee71
github.com/networkservicemesh/sdk-sriov v0.0.0-20231122111612-d0604b634b7c
github.com/networkservicemesh/sdk-vpp v0.0.0-20231122111632-e932e1e7f850
github.com/networkservicemesh/sdk-vpp v0.0.0-20231123112254-6bf4ae39545c
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
github.com/safchain/ethtool v0.3.0
Expand Down Expand Up @@ -58,7 +58,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20231122111254-249e5a95b0da // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20231123111918-aa126f9142bb // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20231123111633-d10933795bd9 h1:ScO0yp
github.com/networkservicemesh/sdk v0.5.1-0.20231123111633-d10933795bd9/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231123112133-3a307c41ee71 h1:jaxcApcevXQypvIZbUSMP/gdALpsc8AWDy1EpLnbP04=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231123112133-3a307c41ee71/go.mod h1:Teu+YOp3uj3wW9hCYpM8tic/oEmLJOtRX0cKOKxIZwA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231122111254-249e5a95b0da h1:4SHNGiWNn4AyXuw84xFizzl9hi5ewY89vxllgtHgtRg=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231122111254-249e5a95b0da/go.mod h1:/w6Rmv3BsfTF/eRDeYu26LGLT9zkkJc+IE8R3VE28ls=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231123111918-aa126f9142bb h1:NK+Ga50XO/e7/1Hu0ilqj3RdGVgrgic06PbgtIL7U0I=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231123111918-aa126f9142bb/go.mod h1:v+KDZdkhQ4QimQy6hWMiXquACmCjT7YT/KZgTXxdYTc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231122111612-d0604b634b7c h1:+GyCJZP6VW6+MZBWJer6PIDLEVxaCQmHy9lGEPzHg0s=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231122111612-d0604b634b7c/go.mod h1:jiK9+vlU7XI0utwpytwTL3A9A02SH0tXePnocjUD2Ec=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231122111632-e932e1e7f850 h1:kCpJYRhrcNcwMW7p2LCG637XpXNOegnfliKqaRENxhw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231122111632-e932e1e7f850/go.mod h1:sny/hPeb89X3+6BhKjQiJGc4ipEju4bNExkzAbVue9o=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231123112254-6bf4ae39545c h1:oujkw4bVN6ff9kGj0WhjElpUXdDU52371k0iKSHnTmc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231123112254-6bf4ae39545c/go.mod h1:uZOd+2qr6sa2AsUoCBwB2pagD38TsZT7g/yKJQHesXI=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb/go.mod h1:gHuTaUs1uFvyOY0Cy9DXvyAR2MtwmlPD2NTyYfr6kLc=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down

0 comments on commit fe97eed

Please sign in to comment.