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 27, 2023
1 parent d6cb8db commit 5411d41
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/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1
github.com/networkservicemesh/sdk v0.5.1-0.20230427091455-fbf0404f010e
github.com/networkservicemesh/sdk-k8s v0.0.0-20230410073353-fcacdc09fc80
github.com/networkservicemesh/sdk-k8s v0.0.0-20230427092143-8fa0a8c3f7d2
github.com/networkservicemesh/sdk-sriov v0.0.0-20230424152507-6ae7b9e5a20f
github.com/networkservicemesh/sdk-vpp v0.0.0-20230427104501-e6c9ca81ba8e
github.com/pkg/errors v0.9.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKks
github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
github.com/networkservicemesh/sdk v0.5.1-0.20230427091455-fbf0404f010e h1:pHZaqjx711QgK/sL7DCpE5KY++oSnmP875/oHfUTovE=
github.com/networkservicemesh/sdk v0.5.1-0.20230427091455-fbf0404f010e/go.mod h1:hmu0t7IxKa1v7Mj7Y3dQrcpRD0YtEyFE5vJorXRQT2A=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230410073353-fcacdc09fc80 h1:VQWClcHJJMIjNXk73Bf9yfHILcxNCukeoKxfH6I7mLU=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230410073353-fcacdc09fc80/go.mod h1:QfMUra/Tnd1KBnGKsUm+NYcPN3X1uJxQzyExoc6rRBU=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230427092143-8fa0a8c3f7d2 h1:BdV/QweHuZ6vTvCgvryhdoMdoY4uHpVKJsSegQPnHCQ=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230427092143-8fa0a8c3f7d2/go.mod h1:Jzwp595QEc0p5051h9tKE0wi5aky0pIaFZxjEuO2Wq0=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230427091835-0ca43b02fb6f h1:0n74CFhWIx7tkTgfcDwKZZvMUuz+asn8O6ef5bW/mAU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230427091835-0ca43b02fb6f/go.mod h1:2Jtk++0/+uIwzEN6fl1xp+SFf2Iep6jqCiPtq3ZD5GM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230424152507-6ae7b9e5a20f h1:kH+CHTYXAD7HBh8jmcxqL9FqRFk4ENiP7t6jNpH7+BY=
Expand Down

0 comments on commit 5411d41

Please sign in to comment.