You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/08/27 03:34:39 UTC
[3/3] git commit: Upgraded ZooKeeper from 3.3.4 to 3.3.6.
Upgraded ZooKeeper from 3.3.4 to 3.3.6.
From: Vinson Lee <vl...@twitter.com>
Review: https://reviews.apache.org/r/13598
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/eb1cd4a7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/eb1cd4a7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/eb1cd4a7
Branch: refs/heads/master
Commit: eb1cd4a7c0ad4310f090d4f0643cf4059ac5246b
Parents: 56a54f5
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Aug 26 18:26:07 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Mon Aug 26 18:26:55 2013 -0700
----------------------------------------------------------------------
3rdparty/versions.am | 2 +-
3rdparty/zookeeper-3.3.4.tar.gz | Bin 13543276 -> 0 bytes
3rdparty/zookeeper-3.3.6.tar.gz | Bin 0 -> 11833706 bytes
src/python/setup.py.in | 2 +-
4 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/eb1cd4a7/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index 5932e1f..5e0b9f8 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -21,4 +21,4 @@
BOTO_VERSION = 2.0b2
DISTRIBUTE_VERSION = 0.6.26
-ZOOKEEPER_VERSION = 3.3.4
+ZOOKEEPER_VERSION = 3.3.6
http://git-wip-us.apache.org/repos/asf/mesos/blob/eb1cd4a7/3rdparty/zookeeper-3.3.4.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/zookeeper-3.3.4.tar.gz b/3rdparty/zookeeper-3.3.4.tar.gz
deleted file mode 100644
index 09d4924..0000000
Binary files a/3rdparty/zookeeper-3.3.4.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/eb1cd4a7/3rdparty/zookeeper-3.3.6.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/zookeeper-3.3.6.tar.gz b/3rdparty/zookeeper-3.3.6.tar.gz
new file mode 100644
index 0000000..5588107
Binary files /dev/null and b/3rdparty/zookeeper-3.3.6.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/eb1cd4a7/src/python/setup.py.in
----------------------------------------------------------------------
diff --git a/src/python/setup.py.in b/src/python/setup.py.in
index 77fa880..8e6ec55 100644
--- a/src/python/setup.py.in
+++ b/src/python/setup.py.in
@@ -20,7 +20,7 @@ src_python_dist = os.path.join('src', 'python', 'dist')
src_python_native = os.path.join('src', 'python', 'native')
leveldb = os.path.join('3rdparty', 'leveldb')
-zookeeper = os.path.join('3rdparty', 'zookeeper-3.3.4', 'src', 'c')
+zookeeper = os.path.join('3rdparty', 'zookeeper-3.3.6', 'src', 'c')
libprocess = os.path.join('3rdparty', 'libprocess')
# Even though a statically compiled libprocess should include glog,