Repository: incubator-zeppelin Updated Branches: refs/heads/master 1b29275e0 -> cc24227bf
Remove duplicated java option concats in common.sh ### What is this PR for? There are some java option concats in common.sh, which are executed twice when start an interpreter. This makes some of the options invalid, such as remote debugging options ### What type of PR is it? Bug Fix ### Todos ### Is there a relevant Jira issue? [ZEPPELIN-686](https://issues.apache.org/jira/browse/ZEPPELIN-686) ### How should this be tested? Set remote debug options: ``` export ZEPPELIN_INTP_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n ``` Start the Zeppelin daemon, then create & run a job to trigger starting an interpreter. The job should fail without the fix. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? NO * Is there breaking changes for older versions? NO * Does this needs documentation? NO Author: Zhong Wang <[email protected]> Closes #749 from zhongneu/fix-duplicated-java-opts and squashes the following commits: f89dbb6 [Zhong Wang] revert change for JAVA_OPTS for compatibility 75959ea [Zhong Wang] remove unneccessary concats in common.sh Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/cc24227b Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/cc24227b Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/cc24227b Branch: refs/heads/master Commit: cc24227bf0a210421a690b988343f10060a37d52 Parents: 1b29275 Author: Zhong Wang <[email protected]> Authored: Thu Mar 3 20:53:37 2016 -0800 Committer: Felix Cheung <[email protected]> Committed: Wed Mar 9 22:02:49 2016 -0800 ---------------------------------------------------------------------- bin/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/cc24227b/bin/common.sh ---------------------------------------------------------------------- diff --git a/bin/common.sh b/bin/common.sh index 3e3ffc5..542d515 100644 --- a/bin/common.sh +++ b/bin/common.sh @@ -104,7 +104,7 @@ if [[ -z "${ZEPPELIN_INTP_MEM}" ]]; then export ZEPPELIN_INTP_MEM="${ZEPPELIN_MEM}" fi -JAVA_INTP_OPTS+=" ${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING}" +JAVA_INTP_OPTS="${ZEPPELIN_INTP_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING}" export JAVA_INTP_OPTS
