diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | third_party/protobuf | 0 | ||||
| -rwxr-xr-x | tools/run_tests/run_sanity.sh | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 557321001f..a5cf3aaaee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ [submodule "third_party/protobuf"] path = third_party/protobuf url = https://github.com/google/protobuf.git - branch = v3.0.0-alpha-1 + branch = v3.0.0-alpha-3 [submodule "third_party/gflags"] path = third_party/gflags url = https://github.com/gflags/gflags.git diff --git a/third_party/protobuf b/third_party/protobuf -Subproject 8908cf16fe81f42c766fdf067b1da4554f54ed8 +Subproject 3e2c8a5dd79481e1d36572cdf65be93514ba658 diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/run_sanity.sh index 003e525526..ebb09d9469 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) - 8908cf16fe81f42c766fdf067b1da4554f54ed87 third_party/protobuf (v3.0.0-alpha-1-1044-g8908cf1) + 3e2c8a5dd79481e1d36572cdf65be93514ba6581 third_party/protobuf (v3.0.0-alpha-1-1048-g3e2c8a5) 50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8) EOF |