diff options
author | 2017-11-13 21:51:27 -0700 | |
---|---|---|
committer | 2017-11-13 21:51:27 -0700 | |
commit | d692b76864712405a1d1c10626b03a06b6b2ac3b (patch) | |
tree | 688a9aedbdb1df36ce2381e5c1a5cceb1d0d2680 /tools/run_tests/sanity/check_submodules.sh | |
parent | bd42ca1110c0aff7a91bdb5e2077e6d69721f4f8 (diff) | |
parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) |
Pulling upstream changes and resolving merge conflicts with third_party/cares/cares.BUILD
Diffstat (limited to 'tools/run_tests/sanity/check_submodules.sh')
-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 2aee0001a3..1f7b078ff7 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -26,7 +26,7 @@ want_submodules=`mktemp /tmp/submXXXXXX` git submodule | awk '{ print $1 }' | sort > $submodules cat << EOF | awk '{ print $1 }' | sort > $want_submodules - 44c25c892a6229b20db7cd9dc05584ea865896de third_party/benchmark (v0.1.0-343-g44c25c8) + 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0) be2ee342d3781ddb954f91f8a7e660c6f59e87e5 third_party/boringssl (heads/chromium-stable) 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7) 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0) |