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 2014/11/12 00:24:46 UTC
mesos git commit: Added missing ZooKeeper patch file to the Makefile.
Repository: mesos
Updated Branches:
refs/heads/master 6404a401c -> 8adb36e3f
Added missing ZooKeeper patch file to the Makefile.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8adb36e3
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8adb36e3
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8adb36e3
Branch: refs/heads/master
Commit: 8adb36e3f72b575dea53013e7e790cb6c7957ae0
Parents: 6404a40
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Tue Nov 11 15:11:32 2014 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Nov 11 15:24:39 2014 -0800
----------------------------------------------------------------------
3rdparty/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/8adb36e3/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 6621a69..7c244a0 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -51,6 +51,11 @@ EXTRA_DIST = \
EXTRA_DIST += \
$(LEVELDB).patch
+# We need to patch ZooKeeper in order to get 3.4.5 to compile on
+# OS X 10.10. See: MESOS-1797.
+EXTRA_DIST += \
+ $(ZOOKEEPER).patch
+
CLEAN_EXTRACTED = \
$(DISTRIBUTE) \
$(LEVELDB) \