You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/11 01:26:07 UTC
[13/20] git commit: Merge branch 'driver-test' of
github.com:tdas/incubator-spark into driver-test
Merge branch 'driver-test' of github.com:tdas/incubator-spark 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/d7ec73ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/d7ec73ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/d7ec73ac
Branch: refs/heads/master
Commit: d7ec73ac761cfd7823bc34fac7e56c8392bdf8dc
Parents: 9d3d9c8 38d75e1
Author: Tathagata Das <ta...@gmail.com>
Authored: Fri Jan 10 11:44:17 2014 +0000
Committer: Tathagata Das <ta...@gmail.com>
Committed: Fri Jan 10 11:44:17 2014 +0000
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------