diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2015-05-19 13:46:40 -0700 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2015-05-19 13:46:40 -0700 |
| commit | 0cd547abbb7739883ac3199eb26dd8f0be376014 (patch) | |
| tree | eac9d4ab894da3be364b6a102bc70a13ebe3e000 | |
| parent | 0dc2927b2e8c685bd9c19df2f24cd89828637fb7 (diff) | |
| parent | 15514b557c4714572a7c628fd3bad4fb188f7e9b (diff) | |
Merge pull request #1660 from jtattermusch/upgrade_protobufs2
Upgrade protobuf to version containing ObjectiveC and csharp.
| m--------- | third_party/protobuf | 0 | ||||
| -rwxr-xr-x | tools/run_tests/run_sanity.sh | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/third_party/protobuf b/third_party/protobuf -Subproject 7d5cf8d7a1bd24acce56296747731051ebe1b18 +Subproject a8b38c598d7f65b281a72809b28117afdb76093 diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/run_sanity.sh index aa241b03dd..07e559fb03 100755 --- a/tools/run_tests/run_sanity.sh +++ b/tools/run_tests/run_sanity.sh @@ -45,6 +45,6 @@ git submodule > $submodules diff -u $submodules - << EOF 05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f) 3df69d3aefde7671053d4e3c242b228e5d79c83f third_party/openssl (OpenSSL_1_0_2a) - 7d5cf8d7a1bd24acce56296747731051ebe1b180 third_party/protobuf (v3.0.0-alpha-1-150-g7d5cf8d) + a8b38c598d7f65b281a72809b28117afdb760931 third_party/protobuf (v3.0.0-alpha-1-978-ga8b38c5) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) EOF |