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 11, 2022
1 parent c76638d commit 9b60a9d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/sdk v0.5.1-0.20220211161956-9d5c3f77ef21
github.com/networkservicemesh/sdk-k8s v0.0.0-20220211162538-1e0cca96a829
github.com/networkservicemesh/sdk-sriov v0.0.0-20220211005241-cf58afc98718
github.com/networkservicemesh/sdk-vpp v0.0.0-20220211044749-ba869af8afde
github.com/networkservicemesh/sdk-vpp v0.0.0-20220211162831-62dd3ee290b4
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-beta.2
Expand Down
9 changes: 4 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -385,18 +385,17 @@ github.com/nats-io/stan.go v0.10.0/go.mod h1:0jEuBXKauB1HHJswHM/lx05K48TJ1Yxj6VI
github.com/networkservicemesh/api v1.1.2-0.20220119092736-21eda250c390 h1:GREf14twiQkUInGh+M0qQH+jNQ9uvTfQC2FVieDd7tQ=
github.com/networkservicemesh/api v1.1.2-0.20220119092736-21eda250c390/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/sdk v0.5.1-0.20220211004545-d2899c1a3de4/go.mod h1:u3HgGqMae6MFZ//JRrN8CkEJ7pwr+CWBG7cvHymhHDY=
github.com/networkservicemesh/sdk v0.5.1-0.20220211044058-1dc007c3929b/go.mod h1:SV1wqQn3Wk30dAhstenbrCgNHt/jH55rMzQDi2Bygok=
github.com/networkservicemesh/sdk v0.5.1-0.20220211161956-9d5c3f77ef21 h1:Sq/ehU9AibtJ3JoH6+6TdMP+59Cnzlk8d+eOT3duLIE=
github.com/networkservicemesh/sdk v0.5.1-0.20220211161956-9d5c3f77ef21/go.mod h1:SV1wqQn3Wk30dAhstenbrCgNHt/jH55rMzQDi2Bygok=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220211162538-1e0cca96a829 h1:pPUDszEp8Ei8tZJYYgoe15gHiI7hrf8ryBAKQbPOQC4=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220211162538-1e0cca96a829/go.mod h1:PSQuPSFZr7wV4OVqPzuqlNKn3IEZr+QQ/Ez+cbIKesQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220211004815-56f463e2ad17/go.mod h1:KBylvRuTCoaM1VqQTrIYlt81pFB5ghQP8AjSAZlP0cw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220211044328-11bbe4343e5a h1:Bmbz3afLt4UZ24uW1AUL1FkSica5DkEhiw9oJgbTJkg=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220211044328-11bbe4343e5a/go.mod h1:DhTAK5L3QpjzuduRQjKBdV25p4bnlAbr7DGu/mSTaX8=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220211162325-5855377a9983 h1:gGw7HjFbtNx6UnD4LUWryJe7PpKpi1je7/GEepXemZU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220211162325-5855377a9983/go.mod h1:jBdeHEtwGph0ViNKIteRXqvpe3KSpt5cSw8r3dI1Ih8=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220211005241-cf58afc98718 h1:jTDr1Hm9cvsB8erCe1U1wh0M/ocwzpdpAx2UFXwDs4A=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220211005241-cf58afc98718/go.mod h1:bq4VsiBN//VNCeeeo/jEjgDa/RBzhH1DKHKjGiUzWsg=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220211044749-ba869af8afde h1:g4N8LuZca9RVMvHfuMYQuRXNhFsTuvaKYF9uvTy5fqQ=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220211044749-ba869af8afde/go.mod h1:e8kgrzIYIrJIN+TXbVxk7L0k0Nx91oJqiaimBZ/nCbo=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220211162831-62dd3ee290b4 h1:Iq5XiuxwmKDttZXmU3QekUHmi78Ezm3GXSW7xvoUeps=
github.com/networkservicemesh/sdk-vpp v0.0.0-20220211162831-62dd3ee290b4/go.mod h1:lKbt93FmrxQKpe8LX5f2YeSO4T+ZVcFvTug0cNPoAoo=
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 9b60a9d

Please sign in to comment.