diff options
| author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
|---|---|---|
| committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
| commit | 46cb980a5f5ba55f341b8bcce4f0d1e5213989d3 (patch) | |
| tree | ff3823085f27c0f4477d25a056d333c429c5d6c9 /bin/compute-classpath.cmd | |
| parent | 150089dae12bbba693db4edbfcea360b443637df (diff) | |
| parent | b2e690f839e7ee47f405135d35170173386c5d13 (diff) | |
| download | spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.gz spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.bz2 spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.zip | |
Fixed merge conflict
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 |