diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-03 21:29:33 -0800 |
| commit | 604fad9c39763012d97b404941f7ba7137ec2eed (patch) | |
| tree | a327c39fcf9ac53e17fbeb5dfedb11e04f505f3c /bin/compute-classpath.cmd | |
| parent | 9e6f3bdcda1ab48159afa4f54b64d05e42a8688e (diff) | |
| parent | c4d6145f7fde8a516024e886314bf8fecde817ea (diff) | |
| download | spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.gz spark-604fad9c39763012d97b404941f7ba7137ec2eed.tar.bz2 spark-604fad9c39763012d97b404941f7ba7137ec2eed.zip | |
Merge remote-tracking branch 'apache-github/master' into remove-binaries
Conflicts:
core/src/test/scala/org/apache/spark/DriverSuite.scala
docs/python-programming-guide.md
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 |