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 Nov 28, 2023
1 parent b1b1d44 commit 71d8397
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.20231128120626-c1f9028d2803
github.com/networkservicemesh/sdk-k8s v0.0.0-20231128121049-a06d88f948fa
github.com/networkservicemesh/sdk-sriov v0.0.0-20231124094207-86a8285ad1ef
github.com/networkservicemesh/sdk-sriov v0.0.0-20231128121310-b0e19cbc17b7
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-20231124093522-404b33c4a701 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20231128120935-d39fc2d4950b // 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.20231128120626-c1f9028d2803 h1:W+m4VG
github.com/networkservicemesh/sdk v0.5.1-0.20231128120626-c1f9028d2803/go.mod h1:t0gOsubf+efkL9Ncy3+PvVKfr/xMGP0tA8HlFFJYz/s=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231128121049-a06d88f948fa h1:X5zdEKJevPsMUYK8P43mTHGIMQEn+FXFM+9sicYl3A4=
github.com/networkservicemesh/sdk-k8s v0.0.0-20231128121049-a06d88f948fa/go.mod h1:kVo0s9tjBXNFPXrXCAyLj4mlFzozeWOesnXcJnumdUQ=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231124093522-404b33c4a701 h1:RWeSA9WKvf/7t5KRxAYleHJBmMQcmMPTgke8sezhlRU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231124093522-404b33c4a701/go.mod h1:PG64vINfZyFIw0EwLaEZMzuu1Z/wSmy+yxcdI0nbpjg=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231124094207-86a8285ad1ef h1:tOJ2rr8sL21Uz/07Kx4lJOz1qj693crXOJARZd3fwpI=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231124094207-86a8285ad1ef/go.mod h1:GQo6Twdrw/jvSzhCzJlJkNDVJealeAq7njc1j/z78II=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231128120935-d39fc2d4950b h1:DNL9cnMlBzYpjHbBbwmzhnuRqAXqg7TojY9R7eSxd+g=
github.com/networkservicemesh/sdk-kernel v0.0.0-20231128120935-d39fc2d4950b/go.mod h1:J9C7QbMyk4m3StKJWuUn/D5yfx1/txolvR8u/pyaiA0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231128121310-b0e19cbc17b7 h1:uT5Wmo0CQ6KZcKlE1sUNKRGH0/clIPXACxpFA2OVhq0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20231128121310-b0e19cbc17b7/go.mod h1:MDZGcU2GcSLN1n9SMue+2LePaNLtvP123iycWq6LHgs=
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 71d8397

Please sign in to comment.