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
…ersions to the latest

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
  • Loading branch information
NSMBot committed Jan 16, 2024
1 parent 6fea6e0 commit 731e589
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 @@ -10,7 +10,7 @@ require (
github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985
github.com/networkservicemesh/govpp v0.0.0-20240115135805-9d7177f85ad9
github.com/networkservicemesh/sdk v0.5.1-0.20240116092606-d76b20e94a58
github.com/networkservicemesh/sdk-vpp v0.0.0-20240116093629-ba25c4516e9d
github.com/networkservicemesh/sdk-vpp v0.0.0-20240116092701-4c9782aa684c
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240116092606-d76b20e94a58 h1:Nt1c0p
github.com/networkservicemesh/sdk v0.5.1-0.20240116092606-d76b20e94a58/go.mod h1:rw2ug2AngItEh13ectyCGrxRhGTt/yvJt2SrysoU/Dc=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240116092933-880c449b8902 h1:zGa/rEOz2u6EthYvGKCpZv1JZ5CknJJ+/TmR6udYriM=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240116092933-880c449b8902/go.mod h1:V5r/xaRQyw58bVKLnLsc60CbdUfGV2q6U/lmZH+17zU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240116093629-ba25c4516e9d h1:Y9FZrcHP0M7ATVYOL39hIZRY8F/9VMFfeGrRNM80iC0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240116093629-ba25c4516e9d/go.mod h1:4DytlENum+hsz8/Deo+7mzXdjdPquy/N1UnuPiaclpA=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240116092701-4c9782aa684c h1:4QZ4n77FD+bFScNSyajPozUtOUB4VdmbwtXTKeLY0kU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240116092701-4c9782aa684c/go.mod h1:xQp6OFb2+h2UmTGOhUEe6naA22vARH/Qj4zaIHNtkwk=
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 731e589

Please sign in to comment.