include a bugfix in third_party/protobuf

pull/25131/head
Jan Tattermusch 4 years ago
parent c26961b89c
commit 7fc2828987
  1. 8
      bazel/grpc_deps.bzl
  2. 2
      third_party/protobuf
  3. 2
      tools/run_tests/sanity/check_submodules.sh

@ -169,11 +169,11 @@ def grpc_deps():
if "com_google_protobuf" not in native.existing_rules():
http_archive(
name = "com_google_protobuf",
sha256 = "04c5e84492093469a7e6342114df3cfd1281e4a90b0d18428ac6c297b87c03e3",
strip_prefix = "protobuf-2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10",
sha256 = "ac3773b90abe689dab5bf1d4a7611e9c3898cb438ddb610117c9014f4ff736b2",
strip_prefix = "protobuf-4a09d77a85a46c65d8b070e20dc88db904eb83af",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10.tar.gz",
"https://github.com/google/protobuf/archive/2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10.tar.gz",
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/4a09d77a85a46c65d8b070e20dc88db904eb83af.tar.gz",
"https://github.com/google/protobuf/archive/4a09d77a85a46c65d8b070e20dc88db904eb83af.tar.gz",
],
)

@ -1 +1 @@
Subproject commit fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a
Subproject commit 4a09d77a85a46c65d8b070e20dc88db904eb83af

@ -35,7 +35,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb)
c9ccac7cb7345901884aabf5d1a786cfa6e2f397 third_party/googletest (6e2f397)
15ae750151ac9341e5945eb38f8982d59fb99201 third_party/libuv (v1.34.0)
2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10 third_party/protobuf (v3.7.0-rc.2-1277-gfde7cf735)
4a09d77a85a46c65d8b070e20dc88db904eb83af third_party/protobuf (v3.7.0-rc.2-1277-gfde7cf735)
e020f3aef8ae6cb59f384bfbaaed72e71e88ccd6 third_party/protoc-gen-validate (v0.4.1)
aecba11114cf1fac5497aeb844b6966106de3eb6 third_party/re2 (heads/master)
1f710aca26a95876e64973a6d2a927a9f4b20ca4 third_party/udpa (heads/master)

Loading…
Cancel
Save