aboutsummaryrefslogtreecommitdiff
path: root/docs/scala-programming-guide.md
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-01-08 00:38:31 -0800
committerPatrick Wendell <pwendell@gmail.com>2014-01-08 00:38:31 -0800
commitbc81ce040ded3fe791ecffb15baa408346afc92a (patch)
tree3330fddcffbca7bd8f42f2fa96ded31cdb0430f9 /docs/scala-programming-guide.md
parent3ec21f2eee0a322bcb5cce9678a816b012227a61 (diff)
parentbb6a39a6872fb8e7118c5a402b7b9d67459e9a64 (diff)
downloadspark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.gz
spark-bc81ce040ded3fe791ecffb15baa408346afc92a.tar.bz2
spark-bc81ce040ded3fe791ecffb15baa408346afc92a.zip
Merge remote-tracking branch 'apache-github/master' into standalone-driver
Conflicts: core/src/test/scala/org/apache/spark/deploy/JsonProtocolSuite.scala pom.xml
Diffstat (limited to 'docs/scala-programming-guide.md')
-rw-r--r--docs/scala-programming-guide.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/scala-programming-guide.md b/docs/scala-programming-guide.md
index 3d0e8923d5..c1ef46a1cd 100644
--- a/docs/scala-programming-guide.md
+++ b/docs/scala-programming-guide.md
@@ -31,7 +31,7 @@ In addition, if you wish to access an HDFS cluster, you need to add a dependency
artifactId = hadoop-client
version = <your-hdfs-version>
-For other build systems, you can run `sbt assembly` to pack Spark and its dependencies into one JAR (`assembly/target/scala-{{site.SCALA_VERSION}}/spark-assembly-{{site.SPARK_VERSION}}-hadoop*.jar`), then add this to your CLASSPATH. Set the HDFS version as described [here](index.html#a-note-about-hadoop-versions).
+For other build systems, you can run `sbt/sbt assembly` to pack Spark and its dependencies into one JAR (`assembly/target/scala-{{site.SCALA_VERSION}}/spark-assembly-{{site.SPARK_VERSION}}-hadoop*.jar`), then add this to your CLASSPATH. Set the HDFS version as described [here](index.html#a-note-about-hadoop-versions).
Finally, you need to import some Spark classes and implicit conversions into your program. Add the following lines: