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:36 UTC

[06/14] git commit: And update docs to match

And update docs to match


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/d7d95a09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d7d95a09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d7d95a09

Branch: refs/heads/master
Commit: d7d95a099f5f215aff465f948446a8b68113b391
Parents: 0d6700e
Author: Holden Karau <ho...@pigscanfly.ca>
Authored: Sat Jan 4 21:45:22 2014 -0800
Committer: Holden Karau <ho...@pigscanfly.ca>
Committed: Sat Jan 4 21:45:22 2014 -0800

----------------------------------------------------------------------
 .gitignore | 2 +-
 README.md  | 4 ++--
 sbt/sbt    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d7d95a09/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 1692bde..39635d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.iml
 *.iws
 .idea/
-.sbtlib/*.jar
+sbt/*.jar
 .settings
 .cache
 /build/

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d7d95a09/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index db1e2c4..2c08a4a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ This README file only contains basic setup instructions.
 Spark requires Scala 2.10. The project is built using Simple Build Tool (SBT),
 which can be obtained [here](http://www.scala-sbt.org). To build Spark and its example programs, run:
 
-    ./sbt assembly
+    ./sbt/sbt assembly
 
 Once you've built Spark, the easiest way to start using it is the shell:
 
@@ -41,7 +41,7 @@ locally with one thread, or "local[N]" to run locally with N threads.
 Testing first requires [Building](#Building) Spark. Once Spark is built, tests
 can be run using:
 
-`./sbt test`
+`./sbt/sbt test`
  
 ## A Note About Hadoop Versions
 

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/d7d95a09/sbt/sbt
----------------------------------------------------------------------
diff --git a/sbt/sbt b/sbt/sbt
index d21806e..a7146e3 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -5,7 +5,7 @@
 SBT_VERSION=0.12.4
 URL1=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
 URL2=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
-JAR=.sbtlib/sbt-launch-${SBT_VERSION}.jar
+JAR=sbt/sbt-launch-${SBT_VERSION}.jar
 
 printf "Checking for system sbt ["
 if hash sbt 2>/dev/null; then