diff options
| author | Stephen Haberman <stephen@exigencecorp.com> | 2013-02-16 14:31:30 -0600 |
|---|---|---|
| committer | Stephen Haberman <stephen@exigencecorp.com> | 2013-02-16 14:31:30 -0600 |
| commit | 02b4a0d96861fbf608f866940a65aef4408e8c61 (patch) | |
| tree | 718d4ae72f285b89a6d9dc0f5ecde92f4b0346de /run-pyspark | |
| parent | 9d979fb630ae4e91b2ef0a2fefdbe220f99212bf (diff) | |
| parent | 924f47dd11dd9b44211372bc7d7960066e26f682 (diff) | |
| parent | 4281e579c236d0125f44f5ca1d999adb5f894c24 (diff) | |
| download | spark-0.7.0-bizo-1.tar.gz spark-0.7.0-bizo-1.tar.bz2 spark-0.7.0-bizo-1.zip | |
Merge branches 'subtract' and 'bettersplits' into bizov0.7.0-bizo-1
* subtract:
Add RDD.subtract.
* bettersplits:
Update more javadocs.
Tweak test names.
Remove fileServerSuite.txt.
Update default.parallelism docs, have StandaloneSchedulerBackend use it.
Change defaultPartitioner to use upstream split size.
Conflicts:
core/src/main/scala/spark/scheduler/cluster/StandaloneSchedulerBackend.scala
core/src/test/scala/spark/ShuffleSuite.scala