Merge pull request #7924 from dgquintas/bump_protobuf_commit

Updated protobuf to fix gmock url in autogen.sh
8 years ago · 336ce42714
parent 7684c74b3c 505d171c4c
commit 336ce42714
2 changed files with 2 additions and 2 deletions
--- a/third_party/protobuf
+++ b/third_party/protobuf
@ -1 +1 @@
-Subproject commit e8ae137c96444ea313485ed1118c5e43b2099cf1
+Subproject commit bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0
--- 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)
- e8ae137c96444ea313485ed1118c5e43b2099cf1 third_party/protobuf (v3.0.0-beta-4-74-ge8ae137)
+ bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0 third_party/protobuf (v3.0.0-beta-4-160-gbba446b)
 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 bcad91771b7f0bff28a1cac1981d7ef2b9bcef3c third_party/thrift
 EOF