diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-20 12:47:55 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-01-20 12:47:55 -0800 |
| commit | 86057ec7c868262763d1e31b3f3c94bd43eeafb3 (patch) | |
| tree | cdde5e4264549bd10b67e4da73322391b922e14e /docs | |
| parent | 76ff962edcb7f41601c6c2d4fc6714bbc885faa7 (diff) | |
| parent | 9f54d7e1f5a5e6f80b3d710de67f800bef943d33 (diff) | |
| download | spark-86057ec7c868262763d1e31b3f3c94bd43eeafb3.tar.gz spark-86057ec7c868262763d1e31b3f3c94bd43eeafb3.tar.bz2 spark-86057ec7c868262763d1e31b3f3c94bd43eeafb3.zip | |
Merge branch 'master' into streaming
Conflicts:
core/src/main/scala/spark/api/python/PythonRDD.scala
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ec2-scripts.md | 4 | ||||
| -rw-r--r-- | docs/python-programming-guide.md | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docs/ec2-scripts.md b/docs/ec2-scripts.md index 6e1f7fd3b1..931b7a66bd 100644 --- a/docs/ec2-scripts.md +++ b/docs/ec2-scripts.md @@ -96,7 +96,9 @@ permissions on your private key file, you can run `launch` with the `spark-ec2` to attach a persistent EBS volume to each node for storing the persistent HDFS. - Finally, if you get errors while running your jobs, look at the slave's logs - for that job using the Mesos web UI (`http://<master-hostname>:8080`). + for that job inside of the Mesos work directory (/mnt/mesos-work). You can + also view the status of the cluster using the Mesos web UI + (`http://<master-hostname>:8080`). # Configuration diff --git a/docs/python-programming-guide.md b/docs/python-programming-guide.md index 78ef310a00..a840b9b34b 100644 --- a/docs/python-programming-guide.md +++ b/docs/python-programming-guide.md @@ -16,7 +16,6 @@ There are a few key differences between the Python and Scala APIs: * Python is dynamically typed, so RDDs can hold objects of different types. * PySpark does not currently support the following Spark features: - - Accumulators - Special functions on RDDs of doubles, such as `mean` and `stdev` - `lookup` - `persist` at storage levels other than `MEMORY_ONLY` |