diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-13 23:57:27 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-13 23:57:27 -0800 |
| commit | f8e239e058953e8db88e784439cfd9eca446e606 (patch) | |
| tree | d71125aba8f9eda10280cfed70f84556ae593dd2 /bin/compute-classpath.sh | |
| parent | 4e497db8f3826cf5142b2165a08d02c6f3c2cd90 (diff) | |
| parent | fdaabdc67387524ffb84354f87985f48bd31cf60 (diff) | |
| download | spark-f8e239e058953e8db88e784439cfd9eca446e606.tar.gz spark-f8e239e058953e8db88e784439cfd9eca446e606.tar.bz2 spark-f8e239e058953e8db88e784439cfd9eca446e606.zip | |
Merge remote-tracking branch 'apache/master' into filestream-fix
Conflicts:
streaming/src/main/scala/org/apache/spark/streaming/dstream/DStream.scala
Diffstat (limited to 'bin/compute-classpath.sh')
| -rwxr-xr-x | bin/compute-classpath.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 0c82310421..278969655d 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -39,6 +39,7 @@ if [ -f "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*-dep CLASSPATH="$CLASSPATH:$FWDIR/repl/target/scala-$SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/mllib/target/scala-$SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/bagel/target/scala-$SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/graphx/target/scala-$SCALA_VERSION/classes" CLASSPATH="$CLASSPATH:$FWDIR/streaming/target/scala-$SCALA_VERSION/classes" DEPS_ASSEMBLY_JAR=`ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*-deps.jar` @@ -59,6 +60,7 @@ if [[ $SPARK_TESTING == 1 ]]; then CLASSPATH="$CLASSPATH:$FWDIR/repl/target/scala-$SCALA_VERSION/test-classes" CLASSPATH="$CLASSPATH:$FWDIR/mllib/target/scala-$SCALA_VERSION/test-classes" CLASSPATH="$CLASSPATH:$FWDIR/bagel/target/scala-$SCALA_VERSION/test-classes" + CLASSPATH="$CLASSPATH:$FWDIR/graphx/target/scala-$SCALA_VERSION/test-classes" CLASSPATH="$CLASSPATH:$FWDIR/streaming/target/scala-$SCALA_VERSION/test-classes" fi |