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 10, 2023
1 parent fd4d120 commit e2ae66a
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 @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/govpp v0.0.0-20231108193829-2484aa7cd5d9
github.com/networkservicemesh/sdk v0.5.1-0.20231110200419-c7c00eb8dc0f
github.com/networkservicemesh/sdk-k8s v0.0.0-20231110201040-20c2e8e8d8c7
github.com/networkservicemesh/sdk-sriov v0.0.0-20231031175612-0e655752bf94
github.com/networkservicemesh/sdk-sriov v0.0.0-20231110201138-35120c86c35a
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108204836-7ba48512cef3
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
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-20231108095606-df65a4704cea // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20231110200706-3b96df3c7bea // 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,10 +167,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20231110200419-c7c00eb8dc0f h1:tB8EV0
github.com/networkservicemesh/sdk v0.5.1-0.20231110200419-c7c00eb8dc0f/go.mod h1:0SBXaWlnQMrsWmaw0DrZ5lBia1LXyA4oE2oagnOuhaY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231110201040-20c2e8e8d8c7 h1:/eW3QgnCwKW3FwKlljY6OnZo0Yel5de3WY+iD3tByqE=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231110201040-20c2e8e8d8c7/go.mod h1:wBm5d3QXYaecb9bTzg2FLNm1WMxfX3NAglJ7We31FJU=
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-kernel v0.0.0-20231110200706-3b96df3c7bea h1:hpxsDBsjCDS2F+qEAUMyStnA2wF0V6tXPVYe7gJf1os=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231110200706-3b96df3c7bea/go.mod h1:rZfWNTcFrCczLZXI5n08dGLmMVmkUqwRvJjQcv75QPQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231110201138-35120c86c35a h1:7GghX5JCDDRbdAGURwGosSnqEnql/URK4Novu7rDjlc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231110201138-35120c86c35a/go.mod h1:kmxq4w9a8e3TU3+QOg5k4W5D/h4Ewi4AwSa+IF55onw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108204836-7ba48512cef3 h1:UioFH6Pv+dcIFRj03MsU+74+jtpl9zvSbyMhlVodrUI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108204836-7ba48512cef3/go.mod h1:aFBvT8O8Kaga4Yly0i2z9HaYUxfFuce08wHVlpVzn8c=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
Expand Down

0 comments on commit e2ae66a

Please sign in to comment.