spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pwend...@apache.org
Subject [11/20] git commit: Merge remote-tracking branch 'apache/master' into driver-test
Date Sat, 11 Jan 2014 00:26:05 GMT
Merge remote-tracking branch 'apache/master' into driver-test


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/38d75e18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/38d75e18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/38d75e18

Branch: refs/heads/master
Commit: 38d75e18fa48bd230e2ff9478e87274fb0cceb9f
Parents: 4a5558c 4b074fa
Author: Tathagata Das <tathagata.das1565@gmail.com>
Authored: Thu Jan 9 19:31:36 2014 -0800
Committer: Tathagata Das <tathagata.das1565@gmail.com>
Committed: Thu Jan 9 19:31:36 2014 -0800

----------------------------------------------------------------------
 conf/log4j.properties.template                  |  1 +
 .../org/apache/spark/log4j-defaults.properties  |  1 +
 .../scala/org/apache/spark/Partitioner.scala    |  7 ++-
 .../scala/org/apache/spark/SparkContext.scala   | 48 ++++++++++------
 .../main/scala/org/apache/spark/SparkEnv.scala  |  2 +-
 .../org/apache/spark/SparkHadoopWriter.scala    |  4 --
 .../apache/spark/api/java/JavaDoubleRDD.scala   | 12 +++-
 .../org/apache/spark/api/java/JavaPairRDD.scala |  6 ++
 .../org/apache/spark/api/java/JavaRDD.scala     |  6 ++
 .../org/apache/spark/api/java/JavaRDDLike.scala |  6 ++
 .../spark/api/java/JavaSparkContext.scala       | 54 +++++++++++++++++-
 .../org/apache/spark/api/python/PythonRDD.scala |  4 +-
 .../apache/spark/broadcast/HttpBroadcast.scala  |  4 +-
 .../spark/broadcast/TorrentBroadcast.scala      |  2 +-
 .../org/apache/spark/deploy/master/Master.scala |  6 +-
 .../org/apache/spark/deploy/worker/Worker.scala |  2 +-
 .../org/apache/spark/io/CompressionCodec.scala  |  2 +-
 .../spark/network/ConnectionManager.scala       | 18 +++---
 .../spark/network/netty/ShuffleCopier.scala     |  2 +-
 .../org/apache/spark/rdd/CheckpointRDD.scala    |  4 +-
 .../org/apache/spark/rdd/NewHadoopRDD.scala     |  2 +-
 .../org/apache/spark/rdd/PairRDDFunctions.scala | 59 ++++++++++----------
 .../main/scala/org/apache/spark/rdd/RDD.scala   | 32 ++++++-----
 .../spark/scheduler/TaskResultGetter.scala      |  2 +-
 .../spark/scheduler/TaskSchedulerImpl.scala     |  8 +--
 .../apache/spark/scheduler/TaskSetManager.scala |  8 +--
 .../cluster/CoarseGrainedSchedulerBackend.scala |  5 +-
 .../cluster/SimrSchedulerBackend.scala          |  2 +-
 .../mesos/CoarseMesosSchedulerBackend.scala     |  2 +-
 .../cluster/mesos/MesosSchedulerBackend.scala   |  2 +-
 .../spark/serializer/KryoSerializer.scala       |  4 +-
 .../spark/storage/BlockFetcherIterator.scala    |  2 +-
 .../org/apache/spark/storage/BlockManager.scala | 22 ++++----
 .../spark/storage/BlockManagerMaster.scala      |  4 +-
 .../spark/storage/BlockManagerMasterActor.scala |  7 ++-
 .../apache/spark/storage/DiskBlockManager.scala |  2 +-
 .../spark/storage/ShuffleBlockManager.scala     |  4 +-
 .../spark/ui/jobs/JobProgressListener.scala     |  2 +-
 .../scala/org/apache/spark/util/AkkaUtils.scala | 20 +++----
 .../org/apache/spark/util/MetadataCleaner.scala |  2 +-
 .../org/apache/spark/util/XORShiftRandom.scala  |  2 +-
 .../spark/scheduler/TaskSetManagerSuite.scala   |  2 +-
 .../apache/spark/util/XORShiftRandomSuite.scala |  2 +-
 docs/configuration.md                           |  2 +-
 docs/running-on-yarn.md                         |  2 +
 make-distribution.sh                            |  2 +-
 pom.xml                                         |  5 ++
 sbt/sbt                                         | 51 +++++++----------
 .../streaming/dstream/NetworkInputDStream.scala |  4 +-
 .../apache/spark/streaming/scheduler/Job.scala  |  2 +-
 .../streaming/scheduler/JobGenerator.scala      |  2 +-
 .../streaming/scheduler/JobScheduler.scala      |  2 +-
 .../org/apache/spark/deploy/yarn/Client.scala   |  2 +-
 .../cluster/YarnClientSchedulerBackend.scala    |  4 +-
 .../org/apache/spark/deploy/yarn/Client.scala   |  2 +-
 55 files changed, 282 insertions(+), 186 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/38d75e18/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/38d75e18/streaming/src/main/scala/org/apache/spark/streaming/scheduler/JobGenerator.scala
----------------------------------------------------------------------


Mime
View raw message