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 Feb 12, 2024
1 parent 3974f0b commit 807562a
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 @@ -11,7 +11,7 @@ require (
github.com/networkservicemesh/govpp v0.0.0-20240130152300-43babf54855b
github.com/networkservicemesh/sdk v1.11.2
github.com/networkservicemesh/sdk-sriov v0.0.0-20240212110157-32204092822a
github.com/networkservicemesh/sdk-vpp v0.0.0-20240205111032-6cdac61dedd8
github.com/networkservicemesh/sdk-vpp v0.0.0-20240212110256-22734a67c8e3
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6
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 @@ -128,8 +128,8 @@ github.com/networkservicemesh/sdk v1.11.2 h1:HHhA6vjbyVEDffcx2vUuc1/kHqBuTmTJrxb
github.com/networkservicemesh/sdk v1.11.2/go.mod h1:9B6CU54HGgkBQ8d1rQH18HzAMr7kGWNMoYdVARYAkGQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240212110157-32204092822a h1:R9tmLBVm8c80OPxUZyGT1RdvBE3N2EXNd56bFcwAoE4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240212110157-32204092822a/go.mod h1:lTP/g0pAmkYW+RqVRiHdA0gylXD0hrTT0hXyzhi4iPY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240205111032-6cdac61dedd8 h1:GRFkGr9S6fzNGqecxrEhi59n2WgTDPFLDfVbmnm4zxo=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240205111032-6cdac61dedd8/go.mod h1:Zcle33UPtWLUHybLqvUmYI8Oxu0IUzALRocZij4sn6o=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240212110256-22734a67c8e3 h1:QdMMQE+W7o8U/Z4SqY3EFvvNMb9CEM/bHQFVZfRekfk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240212110256-22734a67c8e3/go.mod h1:Ojs9C0pQB/KMnSveSDB2Qi1nyf6f7EYL8Wb48wYOnQc=
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM=
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
Expand Down

0 comments on commit 807562a

Please sign in to comment.