You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/01/07 09:18:40 UTC
[10/14] git commit: Finish documentation changes
Finish documentation changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/7d0094bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7d0094bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7d0094bb
Branch: refs/heads/master
Commit: 7d0094bb562926af1d9b84a19d85329674aee003
Parents: 5a598b2
Author: Holden Karau <ho...@pigscanfly.ca>
Authored: Sun Jan 5 22:12:47 2014 -0800
Committer: Holden Karau <ho...@pigscanfly.ca>
Committed: Sun Jan 5 22:12:47 2014 -0800
----------------------------------------------------------------------
bin/pyspark | 2 +-
bin/spark-class | 2 +-
make-distribution.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7d0094bb/bin/pyspark
----------------------------------------------------------------------
diff --git a/bin/pyspark b/bin/pyspark
index f97dfa7..d6810f4 100755
--- a/bin/pyspark
+++ b/bin/pyspark
@@ -31,7 +31,7 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.jar >& /dev/null
if [[ $? != 0 ]]; then
echo "Failed to find Spark assembly in $FWDIR/assembly/target" >&2
- echo "You need to build Spark with sbt assembly before running this program" >&2
+ echo "You need to build Spark with sbt/sbt assembly before running this program" >&2
exit 1
fi
fi
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7d0094bb/bin/spark-class
----------------------------------------------------------------------
diff --git a/bin/spark-class b/bin/spark-class
index 49b0bef..c4225a3 100755
--- a/bin/spark-class
+++ b/bin/spark-class
@@ -104,7 +104,7 @@ if [ ! -f "$FWDIR/RELEASE" ]; then
jars_list=$(ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/ | grep "spark-assembly.*hadoop.*.jar")
if [ "$num_jars" -eq "0" ]; then
echo "Failed to find Spark assembly in $FWDIR/assembly/target/scala-$SCALA_VERSION/" >&2
- echo "You need to build Spark with 'sbt assembly' before running this program." >&2
+ echo "You need to build Spark with 'sbt/sbt assembly' before running this program." >&2
exit 1
fi
if [ "$num_jars" -gt "1" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/7d0094bb/make-distribution.sh
----------------------------------------------------------------------
diff --git a/make-distribution.sh b/make-distribution.sh
index 61e6654..1a3a5d0 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -95,7 +95,7 @@ export SPARK_HADOOP_VERSION
export SPARK_YARN
cd $FWDIR
-"sbt" "assembly/assembly"
+"sbt/sbt" "assembly/assembly"
# Make directories
rm -rf "$DISTDIR"