You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2017/05/26 17:11:09 UTC

[3/9] mesos git commit: Update 3rdparty build to support protobuf 3.3.0.

Update 3rdparty build to support protobuf 3.3.0.

Review: https://reviews.apache.org/r/58515/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/edbdb030
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/edbdb030
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/edbdb030

Branch: refs/heads/master
Commit: edbdb030312097110f3c7a278bdf596a41a2c38b
Parents: f680ff2
Author: Zhitao Li <zh...@gmail.com>
Authored: Fri May 26 09:59:08 2017 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Fri May 26 09:59:08 2017 -0700

----------------------------------------------------------------------
 3rdparty/cmake/Versions.cmake | 4 ++--
 3rdparty/versions.am          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/edbdb030/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index a7a1340..8a0537b 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -28,8 +28,8 @@ set(ZLIB_HASH           "SHA256=36658CB768A54C1D4DEC43C3116C27ED893E88B02ECFCB44
 if (NOT WIN32)
   set(GLOG_VERSION      "0.3.3")
   set(GLOG_HASH         "SHA256=FBF90C2285BA0561DB7A40F8A4EEFB9AA963E7D399BD450363E959929FE849D0")
-  set(PROTOBUF_VERSION  "2.6.1")
-  set(PROTOBUF_HASH     "SHA256=DBBD7BDD2381633995404DE65A945FF1A7610B0DA14593051B4738C90C6DD164")
+  set(PROTOBUF_VERSION  "3.3.0")
+  set(PROTOBUF_HASH     "SHA256=E43F47C51C4A838F737EE2DA2F183F129EE388272622C403179D5AD28C555F39")
   set(ZOOKEEPER_VERSION "3.4.8")
   set(ZOOKEEPER_HASH    "SHA256=F10A0B51F45C4F64C1FE69EF713ABF9EB9571BC7385A82DA892E83BB6C965E90")
 else (NOT WIN32)

http://git-wip-us.apache.org/repos/asf/mesos/blob/edbdb030/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index 55e170a..f46362c 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -30,7 +30,7 @@ LIBEV_VERSION = 4.22
 NVML_VERSION = 352.79
 PICOJSON_VERSION = 1.3.0
 PIP_VERSION = 7.1.2
-PROTOBUF_VERSION = 2.6.1
+PROTOBUF_VERSION = 3.3.0
 SETUPTOOLS_VERSION = 20.9.0
 WHEEL_VERSION = 0.24.0
 ZOOKEEPER_VERSION = 3.4.8