diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-14 17:37:24 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-07-14 17:37:24 -0400 |
| commit | 1450fd74d91b1fb7e25879e40abff76731ee5b28 (patch) | |
| tree | 7eab3fefdbbb363bb885ca6bf8604131d9395d52 /core | |
| parent | 146a18c2a4ddbe519e4fec210f48b9f81aed4af2 (diff) | |
| parent | ccf48388cd8d8f4e1777be77ab30032d1b15c8c6 (diff) | |
| download | spark-1450fd74d91b1fb7e25879e40abff76731ee5b28.tar.gz spark-1450fd74d91b1fb7e25879e40abff76731ee5b28.tar.bz2 spark-1450fd74d91b1fb7e25879e40abff76731ee5b28.zip | |
Merge branch 'master' into scala-2.9
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/SparkContext.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/SparkContext.scala b/core/src/main/scala/spark/SparkContext.scala index 74e6ff1fec..18bd5c8817 100644 --- a/core/src/main/scala/spark/SparkContext.scala +++ b/core/src/main/scala/spark/SparkContext.scala @@ -257,7 +257,7 @@ extends Logging { def defaultParallelism: Int = scheduler.defaultParallelism // Default min number of splits for Hadoop RDDs when not given by user - def defaultMinSplits: Int = Math.min(defaultParallelism, 4) + def defaultMinSplits: Int = Math.min(defaultParallelism, 2) private var nextShuffleId = new AtomicInteger(0) |