Repository: incubator-zeppelin Updated Branches: refs/heads/branch-0.5.5 49c7d35fa -> e5c1959a0
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 (cherry picked from commit a4db1688c9ce0a172722e289171e82099a43b55d) Signed-off-by: Lee moon soo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/e5c1959a Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/e5c1959a Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/e5c1959a Branch: refs/heads/branch-0.5.5 Commit: e5c1959a069c53d458df3ca47d5a4d3016796e6c Parents: 49c7d35 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:26:06 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/e5c1959a/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
