diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 17:29:21 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-06 17:29:21 -0800 |
| commit | c0498f9265e32ba82bcf48bf0df0f29c6cfea587 (patch) | |
| tree | 55cce48bc1b7dcc4645715d06256c9923d6dd922 /repl/pom.xml | |
| parent | f236ddd1a245a587d5ee331fb67cf41456ed383c (diff) | |
| parent | e4d6057b6692ca5f071819b4ec6eb5240a0a16bc (diff) | |
| download | spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.tar.gz spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.tar.bz2 spark-c0498f9265e32ba82bcf48bf0df0f29c6cfea587.zip | |
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts:
core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
core/src/main/scala/org/apache/spark/deploy/client/TestClient.scala
core/src/main/scala/org/apache/spark/deploy/master/Master.scala
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
Diffstat (limited to 'repl/pom.xml')
| -rw-r--r-- | repl/pom.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index b0e7877bbb..2dfe7ac900 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -127,7 +127,6 @@ <environmentVariables> <SPARK_HOME>${basedir}/..</SPARK_HOME> <SPARK_TESTING>1</SPARK_TESTING> - <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> </environmentVariables> </configuration> </plugin> |