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 Aug 10, 2023
1 parent 0d610a2 commit fca815c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/networkservicemesh/api v1.9.1-0.20230627143611-9785eacf9687
github.com/networkservicemesh/sdk v0.5.1-0.20230801094133-aeae47c771a6
github.com/networkservicemesh/sdk-k8s v0.0.0-20230810010125-e7bc22e23473
github.com/networkservicemesh/sdk-ovs v0.0.0-20230714103247-fa2c32b4d642
github.com/networkservicemesh/sdk-sriov v0.0.0-20230714102638-b47a7bbbf12e
github.com/networkservicemesh/sdk-ovs v0.0.0-20230810010115-2895a001ad38
github.com/networkservicemesh/sdk-sriov v0.0.0-20230801095340-7452850dc144
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.0
github.com/spiffe/go-spiffe/v2 v2.0.0
Expand Down Expand Up @@ -68,7 +68,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230714102159-f7a0057795d7 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230801094449-a44938ecb60d // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/ovn-org/libovsdb v0.6.1-0.20210824154155-9cab5b210dce // indirect
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20210826171620-f06c53111a31 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -442,12 +442,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230801094133-aeae47c771a6 h1:NhTEd3
github.com/networkservicemesh/sdk v0.5.1-0.20230801094133-aeae47c771a6/go.mod h1:r9XRbQ6UlS0+hefduzFb1cX9j3W/XNOqFqUlcQk7xYM=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230810010125-e7bc22e23473 h1:ZyggHFZ4+wA978zCwt3EkvgUBhDtC9XgjTekgcVr/Pg=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230810010125-e7bc22e23473/go.mod h1:8UX43N0WxKwTpSl0wrHMltNLcB1li9zTEukotpfsCWQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230714102159-f7a0057795d7 h1:sUiMDYgL4DD3lnK1BTp5WHJ9xkduLcfPh1APc0OJxV8=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230714102159-f7a0057795d7/go.mod h1:SyZzrqtFI3yyfXJPqhleQ7KeAbbetyUsi7Hye1VKMhk=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230714103247-fa2c32b4d642 h1:749i0Nq/eXXC5w/UIjaDzlgGBWlKXna5XHmDZzQuT0Y=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230714103247-fa2c32b4d642/go.mod h1:L6HsBFpjCnauv5+zNrp1RApbPjLFw6sWThf+6ird9M4=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230714102638-b47a7bbbf12e h1:+U7TORb++BNYMk/JT+/VZRMIcclLTsa8KpcStOhtiSU=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230714102638-b47a7bbbf12e/go.mod h1:bPYkChhH8tFl5FcT9OicRD3h9IhCpXnNcyjvrzIDiuE=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230801094449-a44938ecb60d h1:oPM4dCloMxJ42ivO1fgG/2/sV7tMuEpAdXDqOS++U4U=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230801094449-a44938ecb60d/go.mod h1:/cmYuBWVDzMXVvtzN1WawcIDddb8NPjZwAYvJ23bFzM=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230810010115-2895a001ad38 h1:PhozCl+Qc3teWxOcWI+Sh8ZR0zdAP1IAa9uMjZ0Qyds=
github.com/networkservicemesh/sdk-ovs v0.0.0-20230810010115-2895a001ad38/go.mod h1:06rwksDkf7c6FqGEn4plwJGaGqM4PSXDrI0PeSfokxo=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230801095340-7452850dc144 h1:MjNd4Ka67lit27b4JgINUC7Ctp95V5pi5Q0l8Uyq/Yc=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230801095340-7452850dc144/go.mod h1:Jt36ORe1BNDR5hQOvrfcGI/Puc5875raB1ciNQlh+TA=
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 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
Expand Down

0 comments on commit fca815c

Please sign in to comment.