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 committed Sep 28, 2023
1 parent 1ca3aad commit 71cc712
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 @@ -8,7 +8,7 @@ require (
github.com/edwarnicke/grpcfd v1.1.2
github.com/kelseyhightower/envconfig v1.4.0
github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804
github.com/networkservicemesh/sdk v0.5.1-0.20230922100610-97bacd7153a2
github.com/networkservicemesh/sdk v0.5.1-0.20230928095228-256d2ccfaf72
github.com/networkservicemesh/sdk-vpp v0.0.0-20230928095101-07677ae296e2
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -45,7 +45,7 @@ require (
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.50 // indirect
github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230922100857-9162d4c90b72 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20230928095552-d1f59f58a86d // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804 h1:RDbdW
github.com/networkservicemesh/api v1.10.1-0.20230822145124-c4a3ece88804/go.mod h1:DO7D13Y4x/A8tQ2cQyUWa9o5wi7XHUB8+vITWRKreCc=
github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14 h1:BlBHDA3mmLDAfbzo3iR8gx2Av9TP7hhpHa7CF/q+WoU=
github.com/networkservicemesh/govpp v0.0.0-20230922102554-a46e6ced9b14/go.mod h1:uTpdzM7rhTAJG86sjt3dQcHVABUgohuZCAyGWX5Rfmo=
github.com/networkservicemesh/sdk v0.5.1-0.20230922100610-97bacd7153a2 h1:zucewg+R+ik42Nc2r0MaUzz8kuGh4cJNZU1UqSbmQR0=
github.com/networkservicemesh/sdk v0.5.1-0.20230922100610-97bacd7153a2/go.mod h1:KzbOZkk84r6KMNESKb50DpIWqxqCA88Mb+2jFrAdBJs=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230922100857-9162d4c90b72 h1:9v+iNAms4UjexCWFXsrbePQ5966+7X0UDy/Sh2xfixA=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230922100857-9162d4c90b72/go.mod h1:zzkoj1RRFo0ESoamO0Vn8cawTiaNvHuK98+tRIehkcE=
github.com/networkservicemesh/sdk v0.5.1-0.20230928095228-256d2ccfaf72 h1:kHxDNU5ePuHH7MZceMc1G3dAZueUk1gSu3Rb5fhvFf4=
github.com/networkservicemesh/sdk v0.5.1-0.20230928095228-256d2ccfaf72/go.mod h1:KzbOZkk84r6KMNESKb50DpIWqxqCA88Mb+2jFrAdBJs=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230928095552-d1f59f58a86d h1:zgriDlF2ONE1O96A+21tngjnp31yZljWR51JOvfeuMM=
github.com/networkservicemesh/sdk-kernel v0.0.0-20230928095552-d1f59f58a86d/go.mod h1:TTaMhQFGOOtFlJpNn8ORhq98Xv7tfjpBdIJJVhP9W2g=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230928095101-07677ae296e2 h1:BIxuqh9olAAUkWlm6+UJownO1P0QNtDnjpzBEqWqxtI=
github.com/networkservicemesh/sdk-vpp v0.0.0-20230928095101-07677ae296e2/go.mod h1:K2XS8LchbkmC63zvEvYRGoupcfBrkRPPGD/SOGW1s4U=
github.com/networkservicemesh/vpphelper v0.0.0-20230901145133-a14aecebd1cb h1:SETtZ12eYPkUGafW1DwGb8kSOR8O4OniSuZnqn2bOOw=
Expand Down

0 comments on commit 71cc712

Please sign in to comment.