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 Jul 1, 2023
1 parent f97ed93 commit 73fbbdd
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 @@ -18,7 +18,7 @@ require (
github.com/networkservicemesh/govpp v0.0.0-20230630105900-092690d52a97
github.com/networkservicemesh/sdk v0.5.1-0.20230701165706-df93376cea42
github.com/networkservicemesh/sdk-k8s v0.0.0-20230701170421-45dcba17e39b
github.com/networkservicemesh/sdk-sriov v0.0.0-20230629162853-517dec7cabb0
github.com/networkservicemesh/sdk-sriov v0.0.0-20230701170631-e4329a7cd2cd
github.com/networkservicemesh/sdk-vpp v0.0.0-20230630120920-9142289a2fe0
github.com/pkg/errors v0.9.1
github.com/safchain/ethtool v0.3.0
Expand Down Expand Up @@ -54,7 +54,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-20230630120427-3487ee610336 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230701170142-85e373d5a542 // 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 @@ -240,10 +240,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20230701165706-df93376cea42 h1:uDtDDe
github.com/networkservicemesh/sdk v0.5.1-0.20230701165706-df93376cea42/go.mod h1:r9XRbQ6UlS0+hefduzFb1cX9j3W/XNOqFqUlcQk7xYM=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230701170421-45dcba17e39b h1:79PX/z32rpZ0Lo/7tsF4itAXwnPEiyuEHtGyiMNbZ10=
github.com/networkservicemesh/sdk-k8s v0.0.0-20230701170421-45dcba17e39b/go.mod h1:mnWuKmu78c/ClJAgg/HT/dP3UG/nLU+a56/3oawsyCk=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230630120427-3487ee610336 h1:kPeGiWTvDzzErj/Vne0H+FjjU9zme73O9qeD/kp/22k=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230630120427-3487ee610336/go.mod h1:7sh6xxwDUZrnHIKoIB1v3rj70M1aMwiYiiiblaiG/YM=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230629162853-517dec7cabb0 h1:cJO3sll/o7+Btszr2HwD58aA0wM+KtxpePA6y8FifN0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230629162853-517dec7cabb0/go.mod h1:05zMTOIle9N096LdS9G1Pet8aubYQc5jBlm+kixcT78=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230701170142-85e373d5a542 h1:pzxypOZo/iI399NjkkbnPsFc4ZiH/X6472E+hZkub8Y=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230701170142-85e373d5a542/go.mod h1:BFPvi3csGph/efpop49nlEyHAqL5jVmSE+scilOJDEo=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230701170631-e4329a7cd2cd h1:kDWbUPdzenoIhbgH48N+aiAbiTWVBYkANG5d4G/nZsY=
github.com/networkservicemesh/sdk-sriov v0.0.0-20230701170631-e4329a7cd2cd/go.mod h1:0wl8WZNCLiz9NQvo8Ha7zfqaXoxcA8gsNUYm3+ONPLU=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230630120920-9142289a2fe0 h1:CuNcF27gXeBjsCr0cPy2MmzCOeIlFxCmhQvDWMxwBfc=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230630120920-9142289a2fe0/go.mod h1:Gvfc9+4rclayyD43Qi028z4wa0D3Ao/cfR45PcaKw6k=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
Expand Down

0 comments on commit 73fbbdd

Please sign in to comment.