From 75959ea259b633e568dc84a95f802f26cbf10be2 Mon Sep 17 00:00:00 2001
From: Zhong Wang <wangzhong.neu@gmail.com>
Date: Thu, 25 Feb 2016 22:48:39 -0800
Subject: [PATCH 1/2] remove unneccessary concats in common.sh

---
 bin/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/common.sh b/bin/common.sh
index 1a8e2d7c0df..c941b37ad18 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -96,7 +96,7 @@ if [[ -z "$ZEPPELIN_MEM" ]]; then
   export ZEPPELIN_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m"
 fi
 
-JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}"
+JAVA_OPTS=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}"
 export JAVA_OPTS
 
 # jvm options for interpreter process
@@ -108,7 +108,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
 
 

From f89dbb6668b0838939d6e01d58aedbe88cdf4c1e Mon Sep 17 00:00:00 2001
From: Zhong Wang <wangzhong.neu@gmail.com>
Date: Thu, 3 Mar 2016 20:53:37 -0800
Subject: [PATCH 2/2] revert change for JAVA_OPTS for compatibility

---
 bin/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/common.sh b/bin/common.sh
index c941b37ad18..00e4c4d7b6e 100644
--- a/bin/common.sh
+++ b/bin/common.sh
@@ -96,7 +96,7 @@ if [[ -z "$ZEPPELIN_MEM" ]]; then
   export ZEPPELIN_MEM="-Xms1024m -Xmx1024m -XX:MaxPermSize=512m"
 fi
 
-JAVA_OPTS=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}"
+JAVA_OPTS+=" ${ZEPPELIN_JAVA_OPTS} -Dfile.encoding=${ZEPPELIN_ENCODING} ${ZEPPELIN_MEM}"
 export JAVA_OPTS
 
 # jvm options for interpreter process
@@ -108,7 +108,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