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 Jan 17, 2024
1 parent d3bb8e8 commit 10a2a63
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 @@ -11,7 +11,7 @@ require (
github.com/networkservicemesh/api v1.11.1-0.20231031152153-730abd666985
github.com/networkservicemesh/sdk v0.5.1-0.20240117140958-90f0c79a1560
github.com/networkservicemesh/sdk-k8s v0.0.0-20240117141554-23dd1a00e0d8
github.com/networkservicemesh/sdk-sriov v0.0.0-20240116093619-dfb213a67f2b
github.com/networkservicemesh/sdk-sriov v0.0.0-20240117141758-43f62c9df101
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 @@ -42,7 +42,7 @@ require (
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20240116092933-880c449b8902 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20240117141240-f32d767554a6 // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240117140958-90f0c79a1560 h1:8Hl4Rs
github.com/networkservicemesh/sdk v0.5.1-0.20240117140958-90f0c79a1560/go.mod h1:rw2ug2AngItEh13ectyCGrxRhGTt/yvJt2SrysoU/Dc=
github.com/networkservicemesh/sdk-k8s v0.0.0-20240117141554-23dd1a00e0d8 h1:qvtdqmPP/AfVbtjnwKZ5vmkyDKbQhq8HUMoEtl0T0Ik=
github.com/networkservicemesh/sdk-k8s v0.0.0-20240117141554-23dd1a00e0d8/go.mod h1:JkD/hHP91e6IW8tu4eqhB7ufW86ny/fkkUWokSvZxBk=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240116092933-880c449b8902 h1:zGa/rEOz2u6EthYvGKCpZv1JZ5CknJJ+/TmR6udYriM=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240116092933-880c449b8902/go.mod h1:V5r/xaRQyw58bVKLnLsc60CbdUfGV2q6U/lmZH+17zU=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240116093619-dfb213a67f2b h1:mf7DFY6IzRFTS9EhjTiyVB2DacMB7pswZ1sScE2UIpE=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240116093619-dfb213a67f2b/go.mod h1:YxlSacji2lmmGHPX7iVotcUT8GZgd/jIIXLvj5h/x7A=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240117141240-f32d767554a6 h1:LGcwNJs4F47Tv3xYc77ku/rFl7P1mN7DisaS4g2z7zI=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240117141240-f32d767554a6/go.mod h1:gnd8z3H/NxyZvkfCAFAYhUX/wo+rMkJsf/DgQJ+XiGs=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240117141758-43f62c9df101 h1:W5+jo/V7S24ll+GYyE6H+3pegDGyH1UYIAwRdbFRlq0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240117141758-43f62c9df101/go.mod h1:Pc/BcobqUlQ6XhiirKc4d5biBLL8+BF2TAAFsjZWRXA=
github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk=
github.com/open-policy-agent/opa v0.44.0/go.mod h1:YpJaFIk5pq89n/k72c1lVvfvR5uopdJft2tMg1CW/yU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down

0 comments on commit 10a2a63

Please sign in to comment.