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 Jun 19, 2023
1 parent 8b1b56d commit aba3a09
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 @@ -19,7 +19,7 @@ require (
github.com/networkservicemesh/sdk v0.5.1-0.20230518133110-63043b293cea
github.com/networkservicemesh/sdk-k8s v0.0.0-20230518160028-d63696e0df16
github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979
github.com/networkservicemesh/sdk-vpp v0.0.0-20230518133635-a1da1fd63d53
github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812
github.com/pkg/errors v0.9.1
github.com/safchain/ethtool v0.3.0
github.com/sirupsen/logrus v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20230619140403-8f248dc329bc h1:x
github.com/networkservicemesh/sdk-kernel v0.0.0-20230619140403-8f248dc329bc/go.mod h1:mdtPx9VkMEJaCsDXIKkhD8c5EDrkhn6C3nmv1AGU9nA=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979 h1:hfLJkdhczvDi8ISWQAwaTtJPdVVw4OqI7ASZl3mpXog=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230619140804-d74808032979/go.mod h1:tNZAZ37GJFhwVVOaNhAwexG2l5EIrhZiIyhNeWJXXfk=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230518133635-a1da1fd63d53 h1:YofR6aTEUTQaXoSqEfS6kaCXjnGe8AGO9KGrFiYW4oE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230518133635-a1da1fd63d53/go.mod h1:o6Sg3Dq0Q806o20DHD2kOq6b8wiWQyilySbvOJgA/ow=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812 h1:7sdZqGP13HL2gX75vPYaBWVgKzYvSyFGSaDEKI+7ky4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230619140952-19e1f393a812/go.mod h1:Ftr6VMBw/nNGVed5UBfXiaTNUShhJZ1g51Nam3qlKVQ=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
Expand Down

0 comments on commit aba3a09

Please sign in to comment.