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 e2ae66a commit 5291ffa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion 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.20231110200419-c7c00eb8dc0f
github.com/networkservicemesh/sdk-k8s v0.0.0-20231110201040-20c2e8e8d8c7
github.com/networkservicemesh/sdk-sriov v0.0.0-20231110201138-35120c86c35a
github.com/networkservicemesh/sdk-vpp v0.0.0-20231108204836-7ba48512cef3
github.com/networkservicemesh/sdk-vpp v0.0.0-20231110201238-14b666f1ea52
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
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20231110200706-3b96df3c7bea h1:h
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/sdk-vpp v0.0.0-20231110201238-14b666f1ea52 h1:OSODr0+AUbIPcmGDQ9uwb+9Goc6KWgMeOngUWL0ixJY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231110201238-14b666f1ea52/go.mod h1:tqV0tz9TTdooqQgBzE5FO7sMfF7lHf0LL4ZidARW4M8=
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 5291ffa

Please sign in to comment.