Repository: incubator-zeppelin Updated Branches: refs/heads/master dfbc0e690 -> a4db1688c
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 <[email protected]> This patch had conflicts when merged, resolved by Committer: Lee moon soo <[email protected]> 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 Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/a4db1688 Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/a4db1688 Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/a4db1688 Branch: refs/heads/master Commit: a4db1688c9ce0a172722e289171e82099a43b55d Parents: dfbc0e6 Author: Lee moon soo <[email protected]> Authored: Fri Nov 6 13:57:13 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Fri Nov 6 19:25:51 2015 +0900 ---------------------------------------------------------------------- dev/create_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a4db1688/dev/create_release.sh ---------------------------------------------------------------------- diff --git a/dev/create_release.sh b/dev/create_release.sh index 3d5a61c..63fcbad 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
