Merge pull request #1810 from soltanmm/update-pb3

Update protobuf to release v3.0.0-alpha-3
10 years ago · ab4ef43658
parent 7181d85f8b 19b1478f14
commit ab4ef43658
3 changed files with 3 additions and 3 deletions
--- 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
--- a/third_party/protobuf
+++ b/third_party/protobuf
@ -1 +1 @@
-Subproject commit 8908cf16fe81f42c766fdf067b1da4554f54ed87
+Subproject commit 3e2c8a5dd79481e1d36572cdf65be93514ba6581
--- 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
		`@ -1 +1 @@`
			`Subproject commit 8908cf16fe81f42c766fdf067b1da4554f54ed87`				`Subproject commit 3e2c8a5dd79481e1d36572cdf65be93514ba6581`