From a4db1688c9ce0a172722e289171e82099a43b55d Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Fri, 6 Nov 2015 13:57:13 +0900 Subject: [PATCH] ZEPPELIN-397 Activate spark-1.5 and hadoop-2.4 by default in release script https://issues.apache.org/jira/browse/ZEPPELIN-397 Activate spark-1.5 and hadoop-2.4 by default That'll enable use sc.textFile("s3...") with default configuration without specify SPARK_HOME. Author: Lee moon soo This patch had conflicts when merged, resolved by Committer: Lee moon soo Closes #397 from Leemoonsoo/ZEPPELIN-397 and squashes the following commits: 9855dde [Lee moon soo] Activate spark-1.5 and hadoop-2.4 by default --- dev/create_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/create_release.sh b/dev/create_release.sh index 3d5a61cdbf7..63fcbade273 100755 --- a/dev/create_release.sh +++ b/dev/create_release.sh @@ -122,7 +122,7 @@ function make_binary_release() { rm -rf ${WORKING_DIR}/zeppelin-${RELEASE_NAME}-bin-${BIN_RELEASE_NAME} } -make_binary_release all "-Pyarn -Ppyspark" +make_binary_release all "-Pspark-1.5 -Phadoop-2.4 -Pyarn -Ppyspark" # remove non release files and dirs rm -rf ${WORKING_DIR}/zeppelin