Commit d7ec73ac authored 11 years ago by Tathagata Das

Merge branch 'driver-test' of github.com:tdas/incubator-spark into driver-test

parents 9d3d9c82 38d75e18

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

conf/log4j.properties.template 1 addition, 0 deletions

conf/log4j.properties.template
core/src/main/resources/org/apache/spark/log4j-defaults.properties 1 addition, 0 deletions

...main/resources/org/apache/spark/log4j-defaults.properties
core/src/main/scala/org/apache/spark/Partitioner.scala 4 additions, 3 deletions

core/src/main/scala/org/apache/spark/Partitioner.scala
core/src/main/scala/org/apache/spark/SparkContext.scala 31 additions, 17 deletions

core/src/main/scala/org/apache/spark/SparkContext.scala
core/src/main/scala/org/apache/spark/SparkEnv.scala 1 addition, 1 deletion

core/src/main/scala/org/apache/spark/SparkEnv.scala
core/src/main/scala/org/apache/spark/SparkHadoopWriter.scala 0 additions, 4 deletions

core/src/main/scala/org/apache/spark/SparkHadoopWriter.scala
core/src/main/scala/org/apache/spark/api/java/JavaDoubleRDD.scala 9 additions, 3 deletions

.../main/scala/org/apache/spark/api/java/JavaDoubleRDD.scala
core/src/main/scala/org/apache/spark/api/java/JavaPairRDD.scala 6 additions, 0 deletions

...rc/main/scala/org/apache/spark/api/java/JavaPairRDD.scala
core/src/main/scala/org/apache/spark/api/java/JavaRDD.scala 6 additions, 0 deletions

core/src/main/scala/org/apache/spark/api/java/JavaRDD.scala
core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala 6 additions, 0 deletions

...rc/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
core/src/main/scala/org/apache/spark/api/java/JavaSparkContext.scala 53 additions, 1 deletion

...in/scala/org/apache/spark/api/java/JavaSparkContext.scala
core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala 2 additions, 2 deletions

...rc/main/scala/org/apache/spark/api/python/PythonRDD.scala
core/src/main/scala/org/apache/spark/broadcast/HttpBroadcast.scala 2 additions, 2 deletions

...main/scala/org/apache/spark/broadcast/HttpBroadcast.scala
core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala 1 addition, 1 deletion

...n/scala/org/apache/spark/broadcast/TorrentBroadcast.scala
core/src/main/scala/org/apache/spark/deploy/master/Master.scala 3 additions, 3 deletions

...rc/main/scala/org/apache/spark/deploy/master/Master.scala
core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala 1 addition, 1 deletion

...rc/main/scala/org/apache/spark/deploy/worker/Worker.scala
core/src/main/scala/org/apache/spark/io/CompressionCodec.scala 1 addition, 1 deletion

...src/main/scala/org/apache/spark/io/CompressionCodec.scala
core/src/main/scala/org/apache/spark/network/ConnectionManager.scala 9 additions, 9 deletions

...in/scala/org/apache/spark/network/ConnectionManager.scala
core/src/main/scala/org/apache/spark/network/netty/ShuffleCopier.scala 1 addition, 1 deletion

.../scala/org/apache/spark/network/netty/ShuffleCopier.scala
core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala 2 additions, 2 deletions

core/src/main/scala/org/apache/spark/rdd/CheckpointRDD.scala

with 140 additions and 51 deletions

Please register or to comment