Merge pull request #6521 from nicolasnoble/protobuf-bump

Bumping protobuf submodule to beta-3-pre1.
9 years ago · 331f05cb2c
parent 4ec9e46689 c810a38170
commit 331f05cb2c
3 changed files with 3 additions and 3 deletions
--- a/third_party/protobuf
+++ b/third_party/protobuf
@ -1 +1 @@
-Subproject commit d5fb408ddc281ffcadeb08699e65bb694656d0bd
+Subproject commit a1938b2aa9ca86ce7ce50c27ff9737c1008d2a03
--- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
+++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py
--- a/tools/run_tests/sanity/check_submodules.sh
+++ b/tools/run_tests/sanity/check_submodules.sh
@ -45,7 +45,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
 c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
 f8ac463766281625ad710900479130c7fcb4d63b third_party/nanopb (nanopb-0.3.4-29-gf8ac463)
- d5fb408ddc281ffcadeb08699e65bb694656d0bd third_party/protobuf (v3.0.0-beta-2)
+ a1938b2aa9ca86ce7ce50c27ff9737c1008d2a03 third_party/protobuf (v3.0.0-beta-3-pre1)
 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 EOF
		`@ -1 +1 @@`
			`Subproject commit d5fb408ddc281ffcadeb08699e65bb694656d0bd`				`Subproject commit a1938b2aa9ca86ce7ce50c27ff9737c1008d2a03`