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 18, 2023
1 parent 6fde742 commit 0a3910a
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.20231115135824-7e78948c1d57
github.com/networkservicemesh/sdk-k8s v0.0.0-20231115171822-157b38b21aeb
github.com/networkservicemesh/sdk-sriov v0.0.0-20231118135313-cfcb50fbf019
github.com/networkservicemesh/sdk-vpp v0.0.0-20231115140556-e7c0a9f95366
github.com/networkservicemesh/sdk-vpp v0.0.0-20231118135429-59cf35e78ca0
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-20231118135038-f8971e78ec9b h1:W
github.com/networkservicemesh/sdk-kernel v0.0.0-20231118135038-f8971e78ec9b/go.mod h1:OW2aLaO4rOFKOkkeUPJZrP32/Oj1jwA02Y4BiD10TyI=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231118135313-cfcb50fbf019 h1:nbPcHZicNh/S3/2RL2mBgdm/5+8SysIiShS/qf7qBrs=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231118135313-cfcb50fbf019/go.mod h1:JSK2De6OYp9pqiW+SqsbXxY/z53/3AziovPEhaVLn+M=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231115140556-e7c0a9f95366 h1:P2EjK8iEI6lVJ33QLOWHLW1jBGLP7EAhS7KICYBug18=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231115140556-e7c0a9f95366/go.mod h1:oSVCiqwrpx3UKv9wTi32n8CHkVQaq1iuZgzZDE6AmzM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231118135429-59cf35e78ca0 h1:doxF3Nya2Dmi2KiXS4UD4kV2OA1RXhcd4CezY4z7IPw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20231118135429-59cf35e78ca0/go.mod h1:lCnoSmq49zEb+hz66n1qEvTHtHDNE8jEBdmtlXo+yQo=
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 0a3910a

Please sign in to comment.