diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-19 09:12:09 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-05-19 09:12:09 -0700 |
| commit | 10ff0de2e96c0819b1ca86d27ffdaa63cc6516f8 (patch) | |
| tree | 68771ef0754088fef1b4b3daeae7f7f068e9fc05 /tools | |
| parent | a71b0afdc2916e85c03d73eb9fbedd3d9070676a (diff) | |
| parent | 166d48232de5d4ebcd381b8a365ea34332f28c81 (diff) | |
Merge pull request #6642 from jtattermusch/integrate_changes_from_0_14
Manual merge of 0.14 branch into master.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 3b8d81b18f..6e858fa9c9 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) - a1938b2aa9ca86ce7ce50c27ff9737c1008d2a03 third_party/protobuf (v3.0.0-beta-3-pre1) + 3470b6895aa659b7559ed678e029a5338e535f14 third_party/protobuf (v3.0.0-beta-2-441-g3470b68) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) EOF |