You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/09/03 02:36:58 UTC
git commit: SPARK-3328 fixed make-distribution script --with-tachyon
option.
Repository: spark
Updated Branches:
refs/heads/master e2c901b4c -> 644e31524
SPARK-3328 fixed make-distribution script --with-tachyon option.
Directory path for dependencies jar and resources in Tachyon 0.5.0 has been changed.
Author: Prudhvi Krishna <pr...@gmail.com>
Closes #2228 from prudhvije/SPARK-3328/make-dist-fix and squashes the following commits:
d1d2c22 [Prudhvi Krishna] SPARK-3328 fixed make-distribution script --with-tachyon option.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/644e3152
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/644e3152
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/644e3152
Branch: refs/heads/master
Commit: 644e31524a6a9a22c671a368aeb3b4eaeb61cf29
Parents: e2c901b
Author: Prudhvi Krishna <pr...@gmail.com>
Authored: Tue Sep 2 17:36:53 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Tue Sep 2 17:36:53 2014 -0700
----------------------------------------------------------------------
make-distribution.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/644e3152/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index ee13990..f030d3f 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -219,10 +219,10 @@ if [ "$SPARK_TACHYON" == "true" ]; then
wget "$TACHYON_URL"
tar xf "tachyon-${TACHYON_VERSION}-bin.tar.gz"
- cp "tachyon-${TACHYON_VERSION}/target/tachyon-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib"
+ cp "tachyon-${TACHYON_VERSION}/core/target/tachyon-${TACHYON_VERSION}-jar-with-dependencies.jar" "$DISTDIR/lib"
mkdir -p "$DISTDIR/tachyon/src/main/java/tachyon/web"
cp -r "tachyon-${TACHYON_VERSION}"/{bin,conf,libexec} "$DISTDIR/tachyon"
- cp -r "tachyon-${TACHYON_VERSION}"/src/main/java/tachyon/web/resources "$DISTDIR/tachyon/src/main/java/tachyon/web"
+ cp -r "tachyon-${TACHYON_VERSION}"/core/src/main/java/tachyon/web "$DISTDIR/tachyon/src/main/java/tachyon/web"
if [[ `uname -a` == Darwin* ]]; then
# need to run sed differently on osx
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org