Merge branch 'pyspark'
Conflicts:
zeppelin-interpreter/src/main/java/com/nflabs/zeppelin/interpreter/remote/RemoteInterpreterServer.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/4fac1c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/4fac1c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/4fac1c03
Branch: refs/heads/master
Commit: 4fac1c03e216af7e5931ad4e2ede40a081a78f6c
Parents: d5236b8 69c57ea
Author: Lee moon soo <[email protected]>
Authored: Thu Mar 19 11:48:39 2015 +0900
Committer: Lee moon soo <[email protected]>
Committed: Thu Mar 19 11:48:39 2015 +0900
----------------------------------------------------------------------
conf/zeppelin-env.sh.template | 5 +
conf/zeppelin-site.xml.template | 2 +-
spark/pom.xml | 13 +
.../zeppelin/spark/PySparkInterpreter.java | 367 +++++++++++++++++++
.../nflabs/zeppelin/spark/SparkInterpreter.java | 8 +-
.../nflabs/zeppelin/spark/ZeppelinContext.java | 3 +-
.../main/resources/python/zeppelin_pyspark.py | 123 +++++++
.../remote/RemoteInterpreterServer.java | 3 +-
.../zeppelin/rest/ZeppelinRestApiTest.java | 2 +-
.../zeppelin/conf/ZeppelinConfiguration.java | 1 +
10 files changed, 521 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/4fac1c03/spark/src/main/java/com/nflabs/zeppelin/spark/SparkInterpreter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/4fac1c03/spark/src/main/java/com/nflabs/zeppelin/spark/ZeppelinContext.java
----------------------------------------------------------------------
