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 11, 2024
1 parent 6deabe2 commit 3470236
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.20240111113458-792b7fb5104e
github.com/networkservicemesh/sdk-k8s v0.0.0-20240111114041-996d3021ed14
github.com/networkservicemesh/sdk-sriov v0.0.0-20231226080150-c1c744d6f759
github.com/networkservicemesh/sdk-sriov v0.0.0-20240111114146-db218b7357a1
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-20231226075837-dc0b88acf9e5 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20240111113759-cd0e91a5bd1e // 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.20240111113458-792b7fb5104e h1:eZKNfL
github.com/networkservicemesh/sdk v0.5.1-0.20240111113458-792b7fb5104e/go.mod h1:rw2ug2AngItEh13ectyCGrxRhGTt/yvJt2SrysoU/Dc=
github.com/networkservicemesh/sdk-k8s v0.0.0-20240111114041-996d3021ed14 h1:VejQejIkznIcz6ScNhNosC0BQ7TYDNCr6U6Cs9CxHZE=
github.com/networkservicemesh/sdk-k8s v0.0.0-20240111114041-996d3021ed14/go.mod h1:6BsuyCQZMuRnpzyO88PIJZyCd9Qsr/R/yPCCU20FFug=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231226075837-dc0b88acf9e5 h1:T6ekYwM19Lm1Akswvnx1Ed4HNRZLxk7vS0sxMAe3Fx4=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231226075837-dc0b88acf9e5/go.mod h1:Z9T5Moy6F4FuhC73fZbcustmgYDKBl6R4+ktT7NRDQw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231226080150-c1c744d6f759 h1:bp4RrYE88ZoVXtwW+N4Hq90aMF74VYLg7F4pXdUfZsI=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231226080150-c1c744d6f759/go.mod h1:tndunAezjS3AxI/gSUNiPf4ef7BlExi7uYVRxlL7+BA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240111113759-cd0e91a5bd1e h1:2vEW0gD4nfv14+MnMPtLJ/ewanlQX4Ar1v3lnL7Z0r0=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240111113759-cd0e91a5bd1e/go.mod h1:bs/9GuK9JbPoUkMHSyw/DNiHKimIm0pA4KDUv7RCLeg=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240111114146-db218b7357a1 h1:0fk/AAwDMCxC4KnP8FnmtF/j/hOvVVkPyws5xmfoLhw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20240111114146-db218b7357a1/go.mod h1:CFwfnCgtjq+8QS/GgyyL1u5jjeDaLINUkZ6y70qaF94=
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 3470236

Please sign in to comment.