Merge remote-tracking branch 'upstream/master' into consolidate_schedulers

README.md

core/src/main/scala/org/apache/spark/SparkContext.scala

.../main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala

...scala/org/apache/spark/deploy/worker/ExecutorRunner.scala

.../apache/spark/executor/CoarseGrainedExecutorBackend.scala

core/src/main/scala/org/apache/spark/executor/Executor.scala

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

...n/scala/org/apache/spark/scheduler/ClusterScheduler.scala

.../main/scala/org/apache/spark/scheduler/DAGScheduler.scala

...src/main/scala/org/apache/spark/scheduler/JobLogger.scala

...ain/scala/org/apache/spark/scheduler/ShuffleMapTask.scala

...ark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala

...apache/spark/scheduler/cluster/SimrSchedulerBackend.scala

...in/scala/org/apache/spark/serializer/KryoSerializer.scala

core/src/main/scala/org/apache/spark/storage/BlockInfo.scala

...rc/main/scala/org/apache/spark/storage/BlockManager.scala

...in/scala/org/apache/spark/storage/BlockObjectWriter.scala

...ain/scala/org/apache/spark/storage/DiskBlockManager.scala

core/src/main/scala/org/apache/spark/storage/DiskStore.scala

.../scala/org/apache/spark/storage/ShuffleBlockManager.scala