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 Apr 11, 2024
1 parent 441bb37 commit 96deff3
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.12.1-rc.1.0.20240325104451-92facbceb926
github.com/networkservicemesh/sdk v0.5.1-0.20240405103106-edee168c48df
github.com/networkservicemesh/sdk v0.5.1-0.20240411170628-889386da5699
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -47,7 +47,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-20240328101142-8a444680fbba // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20240405103539-cf3b1676a8b2 // indirect
github.com/networkservicemesh/sdk-kernel v0.0.0-20240411170904-ced9ae93e978 // indirect
github.com/open-policy-agent/opa v0.44.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ github.com/networkservicemesh/api v1.12.1-rc.1.0.20240325104451-92facbceb926 h1:
github.com/networkservicemesh/api v1.12.1-rc.1.0.20240325104451-92facbceb926/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI=
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o=
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA=
github.com/networkservicemesh/sdk v0.5.1-0.20240405103106-edee168c48df h1:+fmCda2GJVcrJqOL7O1ehB5TXcfNe3egs3RcQsBLx4U=
github.com/networkservicemesh/sdk v0.5.1-0.20240405103106-edee168c48df/go.mod h1:kSPLlf71rqB+4mAW8MHkrfWs9cMuQJP7RVkGqpHqKmY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240405103539-cf3b1676a8b2 h1:EQv8ymeAfXb1BY4e+XQNjr0A2SwEki/3aPFSwBJfxb4=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240405103539-cf3b1676a8b2/go.mod h1:GRjDNRAvqZe0K3voQabjQBgDZbRS4KI+kaVVq3JVoic=
github.com/networkservicemesh/sdk v0.5.1-0.20240411170628-889386da5699 h1:yXC6eeQ1oNU7V5T1Dkyjehq+LdXcvYkQrKZVFTSdIf8=
github.com/networkservicemesh/sdk v0.5.1-0.20240411170628-889386da5699/go.mod h1:kSPLlf71rqB+4mAW8MHkrfWs9cMuQJP7RVkGqpHqKmY=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240411170904-ced9ae93e978 h1:efxHzwhbSY/RzJKGHh/CSs+mGskLdWxtDPc9TVG1XD8=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240411170904-ced9ae93e978/go.mod h1:I0rcmU709m8gTsfAw4qtTRCt/XGhe5ZAC+/k0hT+sV4=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8 h1:cA2cRgam7U8RY/rGvprigFokZEx5B2NETIubAS2pVQE=
github.com/networkservicemesh/sdk-vpp v0.0.0-20240411170841-6b6d4026f3b8/go.mod h1:Vi8ng6Khox7GdpgrrtKc7XoNhOlUpoZYLNm3Iegww7M=
github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=
Expand Down

0 comments on commit 96deff3

Please sign in to comment.