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 /bin/compute-classpath.cmd | |
| 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 'bin/compute-classpath.cmd')
| -rw-r--r-- | bin/compute-classpath.cmd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/compute-classpath.cmd b/bin/compute-classpath.cmd index 9e3e10ecaa..4f60bff19c 100644 --- a/bin/compute-classpath.cmd +++ b/bin/compute-classpath.cmd @@ -29,7 +29,7 @@ rem Load environment variables from conf\spark-env.cmd, if it exists if exist "%FWDIR%conf\spark-env.cmd" call "%FWDIR%conf\spark-env.cmd" rem Build up classpath -set CLASSPATH=%SPARK_CLASSPATH%;%FWDIR%conf +set CLASSPATH=%FWDIR%conf if exist "%FWDIR%RELEASE" ( for %%d in ("%FWDIR%jars\spark-assembly*.jar") do ( set ASSEMBLY_JAR=%%d |