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 May 4, 2022
1 parent 37e952e commit 835e8b7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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/networkservicemesh/sdk v0.5.1-0.20220504134043-5e4251adcff0
github.com/networkservicemesh/sdk-k8s v0.0.0-20220504134732-39aeb1fd8696
github.com/networkservicemesh/sdk-sriov v0.0.0-20220504134851-545a79cf58b3
github.com/networkservicemesh/sdk-vpp v0.0.0-20220427225314-7419431e81de
github.com/networkservicemesh/sdk-vpp v0.0.0-20220504135019-802bba8042ba
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -380,18 +380,16 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0=
github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5 h1:5zQY4PhShozvj/GFJS0dX6ocamAB9oWwEOJviAhGUaw=
github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/sdk v0.5.1-0.20220427224149-241ef7526a53/go.mod h1:G+NdPbtzcOWx1VljOj+L4kvZPQyYpiwCp84JYs+hGtc=
github.com/networkservicemesh/sdk v0.5.1-0.20220504134043-5e4251adcff0 h1:zQJfaUrZ6vwNvgzh4ku19HXuHyKoO/nXnbupaf5sRSY=
github.com/networkservicemesh/sdk v0.5.1-0.20220504134043-5e4251adcff0/go.mod h1:G+NdPbtzcOWx1VljOj+L4kvZPQyYpiwCp84JYs+hGtc=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220504134732-39aeb1fd8696 h1:71qGUvifzcqhg/nH90PY/N6+a2M5sEFJ7gbXM0T43lg=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220504134732-39aeb1fd8696/go.mod h1:cI7yli1ex3NbP8b1/ms7C1oain83WUc1bv5WSyWk1YA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220427224608-9bdb959307fc/go.mod h1:Ua5eCgO0QMHn/poyXhPL5IP6wbDwRRzSw/Q2z8OeJtw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220504134411-4a57237faf7b h1:qPWGdecbHaCrBEMkUeLkRNfZFeW+YnTA9don9GYjKcA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220504134411-4a57237faf7b/go.mod h1:lzhToXkmA7YTLn7k05c4Tly+c+hl8R0eY7v1fO1X1bM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220504134851-545a79cf58b3 h1:1q+P3iNFBF+AUwtEva9HID9XPJrXGf3mSXsg9tEsT+s=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220504134851-545a79cf58b3/go.mod h1:dmH96QH8vTLL+BxrFJWF9KGT86nh1/dd3BI2e67opxE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220427225314-7419431e81de h1:ohej2eRCHFCpz+msQbreaEr6E9cINxtFFPKxTNvrAT8=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220427225314-7419431e81de/go.mod h1:0+P2leDgAJ77tOHDNWhwbxR7kXRdRrPAv8cvNJTrZ9s=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220504135019-802bba8042ba h1:yfmzLLHEPILGJCOR8FyPBULpHu1UimZK5Mul4ZwuPoM=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220504135019-802bba8042ba/go.mod h1:G91PySBIGRTGbP0s8sEaFaOhVPKd/qKms5Gkp/x4QnY=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down

0 comments on commit 835e8b7

Please sign in to comment.