Repository: spark Updated Branches: refs/heads/master c4755403e -> 2cdc3e5c6
[SPARK-2702][Core] Upgrade Tachyon dependency to 0.5.0 Author: Haoyuan Li <haoy...@cs.berkeley.edu> Closes #1651 from haoyuan/upgrade-tachyon and squashes the following commits: 6f3f98f [Haoyuan Li] upgrade tachyon to 0.5.0 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2cdc3e5c Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2cdc3e5c Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2cdc3e5c Branch: refs/heads/master Commit: 2cdc3e5c6f5601086590a0cebf40a48f7560d02e Parents: c475540 Author: Haoyuan Li <haoy...@cs.berkeley.edu> Authored: Thu Jul 31 22:53:42 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Thu Jul 31 22:53:42 2014 -0700 ---------------------------------------------------------------------- core/pom.xml | 4 ++-- make-distribution.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/2cdc3e5c/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 04d4b9c..7c60cf1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -192,8 +192,8 @@ </dependency> <dependency> <groupId>org.tachyonproject</groupId> - <artifactId>tachyon</artifactId> - <version>0.4.1-thrift</version> + <artifactId>tachyon-client</artifactId> + <version>0.5.0</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> http://git-wip-us.apache.org/repos/asf/spark/blob/2cdc3e5c/make-distribution.sh ---------------------------------------------------------------------- diff --git a/make-distribution.sh b/make-distribution.sh index 0a3283e..1441497 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -128,7 +128,7 @@ if [[ ! "$JAVA_VERSION" =~ "1.6" && -z "$SKIP_JAVA_TEST" ]]; then if [[ ! $REPLY =~ ^[Yy]$ ]]; then echo "Okay, exiting." exit 1 - fi + fi fi if [ "$NAME" == "none" ]; then @@ -173,7 +173,7 @@ cp $FWDIR/examples/target/scala*/spark-examples*.jar "$DISTDIR/lib/" # Copy example sources (needed for python and SQL) mkdir -p "$DISTDIR/examples/src/main" -cp -r $FWDIR/examples/src/main "$DISTDIR/examples/src/" +cp -r $FWDIR/examples/src/main "$DISTDIR/examples/src/" if [ "$SPARK_HIVE" == "true" ]; then cp $FWDIR/lib_managed/jars/datanucleus*.jar "$DISTDIR/lib/" @@ -199,7 +199,7 @@ cp -r "$FWDIR/ec2" "$DISTDIR" # Download and copy in tachyon, if requested if [ "$SPARK_TACHYON" == "true" ]; then - TACHYON_VERSION="0.4.1" + TACHYON_VERSION="0.5.0" TACHYON_URL="https://github.com/amplab/tachyon/releases/download/v${TACHYON_VERSION}/tachyon-${TACHYON_VERSION}-bin.tar.gz"; TMPD=`mktemp -d 2>/dev/null || mktemp -d -t 'disttmp'`
