diff options
author | Reynold Xin <rxin@cs.berkeley.edu> | 2012-12-20 14:53:40 -0800 |
---|---|---|
committer | Reynold Xin <rxin@cs.berkeley.edu> | 2012-12-20 14:53:40 -0800 |
commit | eac566a7f4a053fedd677fb067e29d98ce9e6e35 (patch) | |
tree | 67a8e79bab238bc542107613dd5a852455c7767f /run | |
parent | 2a87d816a24c62215d682e3a7af65489c0d6e708 (diff) | |
parent | 5e51b889feac28787bfdb546b04d4b3752f3d8d1 (diff) | |
download | spark-eac566a7f4a053fedd677fb067e29d98ce9e6e35.tar.gz spark-eac566a7f4a053fedd677fb067e29d98ce9e6e35.tar.bz2 spark-eac566a7f4a053fedd677fb067e29d98ce9e6e35.zip |
Merge branch 'master' of github.com:mesos/spark into dev
Conflicts:
core/src/main/scala/spark/MapOutputTracker.scala
core/src/main/scala/spark/PairRDDFunctions.scala
core/src/main/scala/spark/ParallelCollection.scala
core/src/main/scala/spark/RDD.scala
core/src/main/scala/spark/rdd/BlockRDD.scala
core/src/main/scala/spark/rdd/CartesianRDD.scala
core/src/main/scala/spark/rdd/CoGroupedRDD.scala
core/src/main/scala/spark/rdd/CoalescedRDD.scala
core/src/main/scala/spark/rdd/FilteredRDD.scala
core/src/main/scala/spark/rdd/FlatMappedRDD.scala
core/src/main/scala/spark/rdd/GlommedRDD.scala
core/src/main/scala/spark/rdd/HadoopRDD.scala
core/src/main/scala/spark/rdd/MapPartitionsRDD.scala
core/src/main/scala/spark/rdd/MapPartitionsWithSplitRDD.scala
core/src/main/scala/spark/rdd/MappedRDD.scala
core/src/main/scala/spark/rdd/PipedRDD.scala
core/src/main/scala/spark/rdd/SampledRDD.scala
core/src/main/scala/spark/rdd/ShuffledRDD.scala
core/src/main/scala/spark/rdd/UnionRDD.scala
core/src/main/scala/spark/storage/BlockManager.scala
core/src/main/scala/spark/storage/BlockManagerId.scala
core/src/main/scala/spark/storage/BlockManagerMaster.scala
core/src/main/scala/spark/storage/StorageLevel.scala
core/src/main/scala/spark/util/MetadataCleaner.scala
core/src/main/scala/spark/util/TimeStampedHashMap.scala
core/src/test/scala/spark/storage/BlockManagerSuite.scala
run
Diffstat (limited to 'run')
-rwxr-xr-x | run | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -80,13 +80,18 @@ CLASSPATH+=":$CORE_DIR/src/main/resources" CLASSPATH+=":$REPL_DIR/target/scala-$SCALA_VERSION/classes" CLASSPATH+=":$EXAMPLES_DIR/target/scala-$SCALA_VERSION/classes" CLASSPATH+=":$STREAMING_DIR/target/scala-$SCALA_VERSION/classes" -for jar in `find $FWDIR/lib_managed/jars -name '*jar'`; do - CLASSPATH+=":$jar" -done -for jar in `find $FWDIR/lib_managed/bundles -name '*jar'`; do +if [ -e "$FWDIR/lib_managed" ]; then + for jar in `find "$FWDIR/lib_managed/jars" -name '*jar'`; do + CLASSPATH+=":$jar" + done + for jar in `find "$FWDIR/lib_managed/bundles" -name '*jar'`; do + CLASSPATH+=":$jar" + done +fi +for jar in `find "$REPL_DIR/lib" -name '*jar'`; do CLASSPATH+=":$jar" done -for jar in `find $REPL_DIR/lib -name '*jar'`; do +for jar in `find "$REPL_DIR/target" -name 'spark-repl-*-shaded-hadoop*.jar'`; do CLASSPATH+=":$jar" done CLASSPATH+=":$BAGEL_DIR/target/scala-$SCALA_VERSION/classes" |