diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-02 17:55:21 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2014-01-02 17:55:21 +0530 |
| commit | 980afd280a331103ce7391adaf484dd497218741 (patch) | |
| tree | a3bef12d6c1296aa42930b8b91a07d8775831e6c /repl-bin | |
| parent | 3713f8129a618a633a7aca8c944960c3e7ac9d3b (diff) | |
| parent | 52ccf4f859d92ed9e86d3720a983ac2c4a1c23bf (diff) | |
| download | spark-980afd280a331103ce7391adaf484dd497218741.tar.gz spark-980afd280a331103ce7391adaf484dd497218741.tar.bz2 spark-980afd280a331103ce7391adaf484dd497218741.zip | |
Merge branch 'scripts-reorg' of github.com:shane-huang/incubator-spark into spark-915-segregate-scripts
Conflicts:
bin/spark-shell
core/pom.xml
core/src/main/scala/org/apache/spark/SparkContext.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
core/src/main/scala/org/apache/spark/ui/UIWorkloadGenerator.scala
core/src/test/scala/org/apache/spark/DriverSuite.scala
python/run-tests
sbin/compute-classpath.sh
sbin/spark-class
sbin/stop-slaves.sh
Diffstat (limited to 'repl-bin')
| -rwxr-xr-x | repl-bin/src/deb/bin/run | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/repl-bin/src/deb/bin/run b/repl-bin/src/deb/bin/run index 47bb654baf..3a6f22f41f 100755 --- a/repl-bin/src/deb/bin/run +++ b/repl-bin/src/deb/bin/run @@ -48,8 +48,7 @@ fi export JAVA_OPTS # Build up classpath -CLASSPATH="$SPARK_CLASSPATH" -CLASSPATH+=":$FWDIR/conf" +CLASSPATH=":$FWDIR/conf" for jar in `find $FWDIR -name '*jar'`; do CLASSPATH+=":$jar" done |