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 Nov 21, 2022
1 parent 78c8b85 commit 0edf7c7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/networkservicemesh/api v1.6.2-0.20221108105251-f71f283feaa5
github.com/networkservicemesh/sdk v0.5.1-0.20221121202637-1d79bf8c68cd
github.com/networkservicemesh/sdk-k8s v0.0.0-20221121203959-ff72267359a9
github.com/networkservicemesh/sdk-sriov v0.0.0-20221115215818-016624699137
github.com/networkservicemesh/sdk-sriov v0.0.0-20221121204559-c4f104b19b9d
github.com/networkservicemesh/sdk-vpp v0.0.0-20221119181453-89baf2cc2b3a
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
Expand Down Expand Up @@ -51,7 +51,7 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20221108115311-a19d97e96552 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20221121203710-833d80721775 // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20221121202637-1d79bf8c68cd h1:hNtKGl
github.com/networkservicemesh/sdk v0.5.1-0.20221121202637-1d79bf8c68cd/go.mod h1:R8RssOQQngiDgmX+DzO7X43Ye4xSfNdc2asv27qewKY=
github.com/networkservicemesh/sdk-k8s v0.0.0-20221121203959-ff72267359a9 h1:zUNJ2sdkAk5gYltsy073pPZ5y3F7s+KhOx1DIn/JMKE=
github.com/networkservicemesh/sdk-k8s v0.0.0-20221121203959-ff72267359a9/go.mod h1:sf1lW0PUqgcSq9xa/RG+IC8DNsVg+f3zCbn+hTHKaRE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20221108115311-a19d97e96552 h1:lO1VOOI2gTNVWetnWtgWaMBgKJWlJb3bHHCR8tVyqR4=
github.com/networkservicemesh/sdk-kernel v0.0.0-20221108115311-a19d97e96552/go.mod h1:86sAzP5Eg8fGvZuav6Ba34hP3jvkpJ99PSDoWkzALjM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221115215818-016624699137 h1:ytDtO5S/zOAPdLF7V4IcoqgUB9X/TXmXh0F333Fe4T8=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221115215818-016624699137/go.mod h1:57eooA5KIS3fR+Dbb6NIvDrkl0ZfMNZyT0AYORh2/MA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20221121203710-833d80721775 h1:r/OaoPTIjbU3UBMN/BoLx+iC30hu0jKg5YqvBZeyTjQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20221121203710-833d80721775/go.mod h1:hH/s3iEIJ8NyKI1jTrxhbXBi4ASsRkxPfYSsIhL5blw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221121204559-c4f104b19b9d h1:jl8ElK8w2PmAUj+7JEOS6FPBx2C0XyPmJvTgZYXYiS0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20221121204559-c4f104b19b9d/go.mod h1:9+6CC0fGa6slTKY4aB9wlwMowP2SfOv8gDNqJGm4Baw=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221119181453-89baf2cc2b3a h1:QHSFo5xtoX7+qe8M2/m8INestN6xB7419L4yWYglEK0=
github.com/networkservicemesh/sdk-vpp v0.0.0-20221119181453-89baf2cc2b3a/go.mod h1:6CMXGLOMqxIVe806YVaGUWUhFHaneAuffYmSRNDSgb0=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
Expand Down

0 comments on commit 0edf7c7

Please sign in to comment.