Skip to content

Commit 95beb4e

Browse files
committed
Merge pull request apache#82 from edwardt/master
Update readme for spark version 1.10 as merge commit 67d067a has upgraded to build against 1.1.0
2 parents 67d067a + 36776c5 commit 95beb4e

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ R.
99
## Installing SparkR
1010

1111
### Requirements
12-
SparkR requires Scala 2.10 and Spark version >= 0.9.0. Note that as
13-
Spark 0.9.0 has not yet been released the current build uses the latest release
12+
SparkR requires Scala 2.10 and Spark version >= 0.9.0. Current build by default uses the 1.1.0
1413
candidate from the Apache staging repositories. You can also build SparkR against a
15-
different Spark version (>= 0.9) by modifying `pkg/src/build.sbt`.
14+
different Spark version (>= 0.9.0) by modifying `pkg/src/build.sbt`.
1615

1716
SparkR also requires the R package `rJava` to be installed. To install `rJava`,
1817
you can run the following command in R:
@@ -25,7 +24,7 @@ To develop SparkR, you can build the scala package and the R package using
2524

2625
./install-dev.sh
2726

28-
If you wish to try out the package directly from github, you can use `install_github` from `devtools`
27+
If you wish to try out the package directly from github, you can use [`install_github`](http://www.inside-r.org/packages/cran/devtools/docs/install_github) from [`devtools`](http://www.inside-r.org/packages/cran/devtools). Note that you can specify which branch, tag etc to install from.
2928

3029
library(devtools)
3130
install_github("amplab-extras/SparkR-pkg", subdir="pkg")
@@ -79,7 +78,7 @@ pass the variable `spark.executor.memory` to the SparkContext constructor.
7978
SparkR comes with several sample programs in the `examples` directory.
8079
To run one of them, use `./sparkR <filename> <args>`. For example:
8180

82-
./sparkR examples/pi.R local[2]
81+
./sparkR examples/pi.R local[2]
8382

8483
You can also run the unit-tests for SparkR by running
8584

0 commit comments

Comments
 (0)