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 Apr 15, 2024
1 parent 973181f commit 7addc7c
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 @@ -18,7 +18,7 @@ require (
github.com/networkservicemesh/sdk-k8s v0.0.0-20240411171110-9f31092be3b3
github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221
github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8
github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6
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 @@ -143,8 +143,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221 h1:q
github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221/go.mod h1:OVCkbv9cgaroH0h0HJOGGomd/z8Dt8Ay6129CFeQEkM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668 h1:M6/V6xUbcEPThzDWvnXk0IzXyOAf8ypfaOPBfrAbYhI=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668/go.mod h1:nWeOsujfmwztHXnGr/KazBc9MfZ86Fks9CVUGRyK91s=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8 h1:cA2cRgam7U8RY/rGvprigFokZEx5B2NETIubAS2pVQE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8/go.mod h1:Vi8ng6Khox7GdpgrrtKc7XoNhOlUpoZYLNm3Iegww7M=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31 h1:LYBpgepblw1iWm9z3l51IQoGQSk6isD9hWsDv5DpVWM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31/go.mod h1:CETBQdISmLtIlvwQiKgz9vgibCvSwSvceYCwL19ni7Q=
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 7addc7c

Please sign in to comment.