zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject incubator-zeppelin git commit: ZEPPELIN-165 Correct PYTHONPATH when SPARK_HOME is defined
Date Wed, 22 Jul 2015 05:31:47 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master b71f04eb9 -> 29a7f8e74


ZEPPELIN-165 Correct PYTHONPATH when SPARK_HOME is defined

https://issues.apache.org/jira/browse/ZEPPELIN-165

When SPARK_HOME is defined, PYTHONPATH is defined as
```
${SPARK_HOME}/python/lib/pyspark.zip:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip"
```
instead of
```
${SPARK_HOME}/python:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip"
```

Author: Lee moon soo <moon@apache.org>

Closes #151 from Leemoonsoo/ZEPPELIN-156 and squashes the following commits:

4c222f8 [Lee moon soo] Add pyspark.zip
e74fe7f [Lee moon soo] Correct PYTHONPATH when SPARK_HOME is defined


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/29a7f8e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/29a7f8e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/29a7f8e7

Branch: refs/heads/master
Commit: 29a7f8e742c5935d22f54be6df1181e3c847a4ab
Parents: b71f04e
Author: Lee moon soo <moon@apache.org>
Authored: Mon Jul 20 09:54:34 2015 +0900
Committer: Lee moon soo <moon@apache.org>
Committed: Wed Jul 22 14:31:40 2015 +0900

----------------------------------------------------------------------
 bin/interpreter.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/29a7f8e7/bin/interpreter.sh
----------------------------------------------------------------------
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 62bc514..93ae1e5 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -74,7 +74,7 @@ if [[ ! -d "${ZEPPELIN_LOG_DIR}" ]]; then
 fi
 
 if [[ ! -z "${SPARK_HOME}" ]]; then
-  PYSPARKPATH="${SPARK_HOME}/python/lib/pyspark.zip:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip"
+  PYSPARKPATH="${SPARK_HOME}/python:${SPARK_HOME}/python/lib/pyspark.zip:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip"
 else
   PYSPARKPATH="${ZEPPELIN_HOME}/interpreter/spark/pyspark/pyspark.zip:${ZEPPELIN_HOME}/interpreter/spark/pyspark/py4j-0.8.2.1-src.zip"
 fi


Mime
View raw message