diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-07-06 18:13:06 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-07-06 18:13:06 -0700 |
| commit | 86fad02d91927ee9ac9d3b5b7a18cfcc8f02a792 (patch) | |
| tree | 78abd98f89ca53ea2a327ddc9714c4ccf4f9d6ac | |
| parent | 5c77320ce0108296223dbf087676196c205a5c18 (diff) | |
| parent | b15af069da766abd3764ee06dc9bb7227ab415e6 (diff) | |
Merge branch 'protobuf-submodule-update' of https://github.com/nicolasnoble/grpc into fix_cpp_deps
| m--------- | third_party/protobuf | 0 | ||||
| -rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/third_party/protobuf b/third_party/protobuf -Subproject 3470b6895aa659b7559ed678e029a5338e535f1 +Subproject bdeb215cab2985195325fcd5e70c3fa751f46e0 diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index f2d7a1429e..b602d69564 100755 --- 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) - d4d13a4349e4e59d67f311185ddcc1890d956d7a third_party/protobuf (v3.0.0-beta-3.2) + bdeb215cab2985195325fcd5e70c3fa751f46e0f third_party/protobuf (v3.0.0-beta-3.3) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) EOF |