diff options
| author | Matei Zaharia <matei@databricks.com> | 2013-12-24 16:37:13 -0500 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2013-12-24 16:37:13 -0500 |
| commit | 3bf7c708d3206b2144aa464b03cef36f6046e0be (patch) | |
| tree | 6ca79f15ae54b0f5e5df152f44ed9dcfcf148a0b /spark-class | |
| parent | d63856c361cf47b1a508397ee9de38a7b5899fa0 (diff) | |
| parent | d5b260e7dd17c43e45f5c16c663d3479fb8757d1 (diff) | |
| download | spark-3bf7c708d3206b2144aa464b03cef36f6046e0be.tar.gz spark-3bf7c708d3206b2144aa464b03cef36f6046e0be.tar.bz2 spark-3bf7c708d3206b2144aa464b03cef36f6046e0be.zip | |
Merge pull request #275 from ueshin/wip/changeclasspathorder
Change the order of CLASSPATH.
SPARK_TOOLS_JAR should be placed after CLASSPATH or at least after
SPARK_CLASSPATH.
If SPARK_TOOLS_JAR is placed before CLASSPATH, all assembled classes and
resources in spark-tools-assembly.jar beat those in CLASSPATH or
SPARK_CLASSPATH, which might be replaced by customized versions.
Diffstat (limited to 'spark-class')
| -rwxr-xr-x | spark-class | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spark-class b/spark-class index 4eb95a9ba2..802e4aa104 100755 --- a/spark-class +++ b/spark-class @@ -129,11 +129,11 @@ fi # Compute classpath using external script CLASSPATH=`$FWDIR/bin/compute-classpath.sh` -CLASSPATH="$SPARK_TOOLS_JAR:$CLASSPATH" +CLASSPATH="$CLASSPATH:$SPARK_TOOLS_JAR" if $cygwin; then - CLASSPATH=`cygpath -wp $CLASSPATH` - export SPARK_TOOLS_JAR=`cygpath -w $SPARK_TOOLS_JAR` + CLASSPATH=`cygpath -wp $CLASSPATH` + export SPARK_TOOLS_JAR=`cygpath -w $SPARK_TOOLS_JAR` fi export CLASSPATH |