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 8, 2023
1 parent 4d6061d commit f728978
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.20231108095252-20150d65bae2
github.com/networkservicemesh/sdk-k8s v0.0.0-20231108095823-77125023d29e
github.com/networkservicemesh/sdk-sriov v0.0.0-20231031175612-0e655752bf94
github.com/networkservicemesh/sdk-vpp v0.0.0-20231031175704-0330acc8f95d
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108100111-1f3ec7b39b13
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-20231031175017-76c2d34bfe04 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20231108095606-df65a4704cea // 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.16.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.20231108095252-20150d65bae2 h1:hK+ZwS
github.com/networkservicemesh/sdk v0.5.1-0.20231108095252-20150d65bae2/go.mod h1:0SBXaWlnQMrsWmaw0DrZ5lBia1LXyA4oE2oagnOuhaY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231108095823-77125023d29e h1:eWYX41fCsvtyOpdteU3ZLlgaO3rl/Kxv5eYLsm94nH4=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231108095823-77125023d29e/go.mod h1:MXH/n6U1bsqCLdyqd2bHEb2dULyRcXlHx3udU4bWBc0=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231031175017-76c2d34bfe04 h1:7DT+F3iQYnnRlmDu/ifXN2IUggMjo/ClqTzQZDnWdpY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231031175017-76c2d34bfe04/go.mod h1:1LwkX9TWks/V/F1U7hm/xtUeT4gLcOmo9heYVfakHbY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231108095606-df65a4704cea h1:2O4d9eWnlefdVUx7ZLz0J89F6pPntUQ/V9FSGgr8D7s=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231108095606-df65a4704cea/go.mod h1:8PDSojDQLeUYrWwWWmTVz+waRw4VcMJ3am2tqfm/YeE=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231031175612-0e655752bf94 h1:QkAeft///LEnoFNuMjnVhx6QT5bsojGydiOjaGi21RM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231031175612-0e655752bf94/go.mod h1:SMUxTwlXORyeVDXRWImiqtTMXDtUxRrNgnoFOP3a3Rg=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231031175704-0330acc8f95d h1:l/WchwxOml7ybmM1uIAE+bzBMXRX8KG6wZUDTpCSpaI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231031175704-0330acc8f95d/go.mod h1:1ZGj5J0fQejKYpjZAJ7wzi2Nz5bjLLGQTQ0kSraDkhk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108100111-1f3ec7b39b13 h1:NT4F6ikAXB4TgJYCR/GQIFTlfomY/PwZ6j+d5QB1uNY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108100111-1f3ec7b39b13/go.mod h1:dE5GInducYEiLGGJI4tssQBWzf5c9Ny8P2ZDVnibJyk=
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 f728978

Please sign in to comment.