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 7, 2022
1 parent 112bac7 commit 376794e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ require (
github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5
github.com/networkservicemesh/sdk v0.5.1-0.20220407205627-db55b92ab6a2
github.com/networkservicemesh/sdk-k8s v0.0.0-20220407210237-a8f544008527
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401202010-f22ec97befd2 // indirect
github.com/networkservicemesh/sdk-sriov v0.0.0-20220401201816-e1b6964ff9a8
github.com/networkservicemesh/sdk-sriov v0.0.0-20220407210436-4588ca3ebe91
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.8.1
github.com/spiffe/go-spiffe/v2 v2.0.0-alpha.4.0.20200528145730-dc11d0c74e85
Expand Down
12 changes: 4 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -351,20 +351,16 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4
github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0=
github.com/networkservicemesh/api v1.2.1-0.20220315001249-f33f8c3f2feb/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
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.20220328192928-739e3867a1b0/go.mod h1:fK/G5mfEDIefFXxRSNXqj1jjd8SEUeZMpQUdCuc7owY=
github.com/networkservicemesh/sdk v0.5.1-0.20220401201557-a016280a5559/go.mod h1:fK/G5mfEDIefFXxRSNXqj1jjd8SEUeZMpQUdCuc7owY=
github.com/networkservicemesh/sdk v0.5.1-0.20220407205627-db55b92ab6a2 h1:Arer/PpQGT9cL/58zzFZbol8FLQExEyBFfDpjWLTswM=
github.com/networkservicemesh/sdk v0.5.1-0.20220407205627-db55b92ab6a2/go.mod h1:NK425uKTgqAo3tHGNZsrFiIxhqqX/bU75ltayQhj2I8=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220407210237-a8f544008527 h1:rf8enLSegXFibh8rIQjaFdIJ+vUjzADmdn7bDh3BA9k=
github.com/networkservicemesh/sdk-k8s v0.0.0-20220407210237-a8f544008527/go.mod h1:CvqOllU9f5Ea4WAszgiU4zH29tx9LGJSBDOpUL2X+AU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401200810-e777a2b489f2/go.mod h1:uNlr+0waYWxx9W/NnxBWHD9LPvjG3Ftzp5asev6Asbk=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401202010-f22ec97befd2 h1:tBowxdXBLeJI0Fy776ozBLfXBCMDvY1/HLPGhsvTR9s=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220401202010-f22ec97befd2/go.mod h1:IVCfAPuyGF3M4ILcGbSlGQjhiNYuhB6/BgA8G+1HOkk=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220401201816-e1b6964ff9a8 h1:fuI266jB6uGpUxD7FiTSUnp+OMRMdmTybgKz17ySVpM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220401201816-e1b6964ff9a8/go.mod h1:wWBSyWfWWUHd3RxX49KABHruxEVKmUfi2C0CZCsEUf8=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220407205919-0109ff22ab1a h1:/hb7449TSo6N7DEJ+uPHGNEsgS3kp0fcJ1QvZMK8Dlc=
github.com/networkservicemesh/sdk-kernel v0.0.0-20220407205919-0109ff22ab1a/go.mod h1:IUrPH1Ygo/2Rp1nwZApFcCRA8kvRJ2gNGwOhdavB1DQ=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220407210436-4588ca3ebe91 h1:9y3+GjXTO3kdoo2MQdtVsLbJGLoyhDpbhg9RV8Q2XL0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20220407210436-4588ca3ebe91/go.mod h1:SAc9YFqvc7DfWcGqIKt5be5GnzuGPHqb7O+04E6ZZBk=
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 376794e

Please sign in to comment.