-
- Downloads
Merge branch 'master' into bootstrap-design
Conflicts: core/src/main/scala/spark/ui/UIUtils.scala core/src/main/scala/spark/ui/jobs/IndexPage.scala core/src/main/scala/spark/ui/storage/RDDPage.scala
No related branches found
No related tags found
Showing
- conf/metrics.properties.template 33 additions, 36 deletionsconf/metrics.properties.template
- core/src/main/resources/spark/ui/static/webui.css 28 additions, 0 deletionscore/src/main/resources/spark/ui/static/webui.css
- core/src/main/scala/spark/SparkContext.scala 38 additions, 4 deletionscore/src/main/scala/spark/SparkContext.scala
- core/src/main/scala/spark/SparkEnv.scala 14 additions, 1 deletioncore/src/main/scala/spark/SparkEnv.scala
- core/src/main/scala/spark/Utils.scala 43 additions, 1 deletioncore/src/main/scala/spark/Utils.scala
- core/src/main/scala/spark/deploy/DeployMessage.scala 6 additions, 0 deletionscore/src/main/scala/spark/deploy/DeployMessage.scala
- core/src/main/scala/spark/deploy/master/ApplicationInfo.scala 5 additions, 2 deletions.../src/main/scala/spark/deploy/master/ApplicationInfo.scala
- core/src/main/scala/spark/deploy/master/ApplicationSource.scala 24 additions, 0 deletions...rc/main/scala/spark/deploy/master/ApplicationSource.scala
- core/src/main/scala/spark/deploy/master/Master.scala 34 additions, 12 deletionscore/src/main/scala/spark/deploy/master/Master.scala
- core/src/main/scala/spark/metrics/MetricsSystem.scala 8 additions, 1 deletioncore/src/main/scala/spark/metrics/MetricsSystem.scala
- core/src/main/scala/spark/rdd/HadoopRDD.scala 1 addition, 0 deletionscore/src/main/scala/spark/rdd/HadoopRDD.scala
- core/src/main/scala/spark/rdd/NewHadoopRDD.scala 1 addition, 0 deletionscore/src/main/scala/spark/rdd/NewHadoopRDD.scala
- core/src/main/scala/spark/rdd/ParallelCollectionRDD.scala 50 additions, 13 deletionscore/src/main/scala/spark/rdd/ParallelCollectionRDD.scala
- core/src/main/scala/spark/scheduler/DAGScheduler.scala 6 additions, 2 deletionscore/src/main/scala/spark/scheduler/DAGScheduler.scala
- core/src/main/scala/spark/scheduler/JobLogger.scala 4 additions, 3 deletionscore/src/main/scala/spark/scheduler/JobLogger.scala
- core/src/main/scala/spark/scheduler/SparkListener.scala 7 additions, 6 deletionscore/src/main/scala/spark/scheduler/SparkListener.scala
- core/src/main/scala/spark/scheduler/TaskResult.scala 17 additions, 2 deletionscore/src/main/scala/spark/scheduler/TaskResult.scala
- core/src/main/scala/spark/scheduler/TaskScheduler.scala 7 additions, 0 deletionscore/src/main/scala/spark/scheduler/TaskScheduler.scala
- core/src/main/scala/spark/scheduler/cluster/ClusterScheduler.scala 15 additions, 10 deletions...main/scala/spark/scheduler/cluster/ClusterScheduler.scala
- core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala 7 additions, 6 deletions...scala/spark/scheduler/cluster/ClusterTaskSetManager.scala
Loading
Please register or sign in to comment