Skip to content

Commit

Permalink
Merge pull request #88630 from pavelkalinnikov/backport22.2-88562
Browse files Browse the repository at this point in the history
release-22.2: upgrade grpc to v.1.49.0
  • Loading branch information
pav-kv committed Sep 26, 2022
2 parents 492c3c8 + e9515af commit fe2a382
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9214,10 +9214,10 @@ def go_deps():
name = "org_golang_google_grpc",
build_file_proto_mode = "disable_global",
importpath = "google.golang.org/grpc",
sha256 = "f7bd2af40f0d6b16f7d771099e0ae7ed3468b9e40faf88be9d9759fffaff2a4a",
strip_prefix = "google.golang.org/grpc@v1.46.0",
sha256 = "bd07e8767218f67342fe6e673754db022d85a62167638791da477fad3f4a868f",
strip_prefix = "google.golang.org/grpc@v1.49.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.46.0.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.49.0.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20220505152158-f39f71e6c8f3.zip": "8aa446ba7fe5a28d398eceefdad569b604bd4f9c0f86662db0d35fbf61d316cf",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.46.0.zip": "f7bd2af40f0d6b16f7d771099e0ae7ed3468b9e40faf88be9d9759fffaff2a4a",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.49.0.zip": "bd07e8767218f67342fe6e673754db022d85a62167638791da477fad3f4a868f",
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/protobuf/org_golang_google_protobuf-v1.28.0.zip": "f06dc39ce93043d6ec91a5106c7ec958be6b4ba520cab3a21a2448d387cf15a4",
"https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/DataDog/dd-trace-go.v1/in_gopkg_datadog_dd_trace_go_v1-v1.17.0.zip": "2ebcc818df0b2d560a61037da4492ae7effbaed67de94339a1d3a72728d2cb09",
"https://storage.googleapis.com/cockroach-godeps/gomod/gopkg.in/airbrake/gobrake.v2/in_gopkg_airbrake_gobrake_v2-v2.0.9.zip": "2db903664908e5a9afafefba94821b9579bbf271e2929c1f0b7b1fdd23f7bbcf",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ require (
golang.org/x/tools v0.1.11
google.golang.org/api v0.80.0
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3
google.golang.org/grpc v1.46.0
google.golang.org/grpc v1.49.0
google.golang.org/protobuf v1.28.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3058,8 +3058,9 @@ google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K
google.golang.org/grpc v1.41.0-dev.0.20210907181116-2f3355d2244e/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d h1:CJP00gEaaYNJuaTXEg456rWNC1oUOfiAiUjuwyAhEmM=
google.golang.org/grpc/examples v0.0.0-20210324172016-702608ffae4d/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE=
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 27 files
+0 −53 google.golang.org/grpc/balancer/balancer.go
+4 −0 google.golang.org/grpc/balancer/base/balancer.go
+70 −0 google.golang.org/grpc/balancer/conn_state_evaluator.go
+30 −11 google.golang.org/grpc/clientconn.go
+45 −9 google.golang.org/grpc/credentials/google/xds.go
+26 −12 google.golang.org/grpc/dialoptions.go
+1 −1 google.golang.org/grpc/encoding/encoding.go
+2 −0 google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go
+2 −2 google.golang.org/grpc/internal/binarylog/binarylog.go
+2 −3 google.golang.org/grpc/internal/envconfig/xds.go
+5 −0 google.golang.org/grpc/internal/grpcutil/method.go
+70 −0 google.golang.org/grpc/internal/internal.go
+6 −0 google.golang.org/grpc/internal/transport/controlbuf.go
+11 −11 google.golang.org/grpc/internal/transport/handler_server.go
+50 −45 google.golang.org/grpc/internal/transport/http2_client.go
+62 −54 google.golang.org/grpc/internal/transport/http2_server.go
+0 −11 google.golang.org/grpc/internal/transport/http_util.go
+3 −3 google.golang.org/grpc/internal/transport/transport.go
+7 −1 google.golang.org/grpc/picker_wrapper.go
+1 −6 google.golang.org/grpc/regenerate.sh
+42 −13 google.golang.org/grpc/resolver/map.go
+90 −44 google.golang.org/grpc/server.go
+3 −4 google.golang.org/grpc/service_config.go
+152 −129 google.golang.org/grpc/stream.go
+1 −1 google.golang.org/grpc/version.go
+0 −1 google.golang.org/grpc/vet.sh
+2 −2 modules.txt

0 comments on commit fe2a382

Please sign in to comment.