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 Dec 11, 2023
1 parent 7a88a8a commit 92b0384
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.20231211110341-821b4bc2de91
github.com/networkservicemesh/sdk-k8s v0.0.0-20231211110818-49c901a36289
github.com/networkservicemesh/sdk-sriov v0.0.0-20231207152107-3a83be6603d8
github.com/networkservicemesh/sdk-sriov v0.0.0-20231211111038-f7546ded56c5
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-20231207151742-7a668bd03b7f // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20231211110647-72c826c90fa7 // 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.20231211110341-821b4bc2de91 h1:ep2vP4
github.com/networkservicemesh/sdk v0.5.1-0.20231211110341-821b4bc2de91/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231211110818-49c901a36289 h1:wxW/XP0zacB6+pQO/clH8XXRa6MsWnEQYdtb5Du6Cl0=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231211110818-49c901a36289/go.mod h1:lxoPnWOjn02Gk6ZVzA1XnhV/DyrxLMCcpKbw1tHsBXw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231207151742-7a668bd03b7f h1:AGEQBa9BSN1oTi8/Lnys+lhsCs6mRyvKvkZ3HvV3Gqs=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231207151742-7a668bd03b7f/go.mod h1:iyJYMCx69b47lEsEobWjGvepByh75PrUjVrL2X/m6B0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231207152107-3a83be6603d8 h1:sJu1Ul/BwjwpY7Fd8YT3dr3f5kfw79JpRYylLuSI9Fw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231207152107-3a83be6603d8/go.mod h1:3z2qsFq5pwsRLMxrCa3aqs7+l5NGzMlw12G0mJH/+mo=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231211110647-72c826c90fa7 h1:34gqt7GWRO0fxvzRCEFGyOCEFMvAiOs19sHEJ/KAaaU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231211110647-72c826c90fa7/go.mod h1:U0bMD7hjEudW+NyQddzjF38f0jkM5/Tjxb1QNveGi5g=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231211111038-f7546ded56c5 h1:kZdGmG1CrtkHf2dI8NpMDDgXpQMPFpVcWWatt0uwwow=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231211111038-f7546ded56c5/go.mod h1:TZXaYtNrQMrK5FL3mafib1pKNlofOAYbK7ojGssmK3w=
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 92b0384

Please sign in to comment.