-
- Downloads
Merge branch 'master' of git://github.com/mesos/spark into scala-2.10
Conflicts: core/src/main/scala/org/apache/spark/SparkContext.scala project/SparkBuild.scala
No related branches found
No related tags found
Showing
- assembly/pom.xml 6 additions, 0 deletionsassembly/pom.xml
- conf/fairscheduler.xml.template 8 additions, 10 deletionsconf/fairscheduler.xml.template
- conf/metrics.properties.template 42 additions, 8 deletionsconf/metrics.properties.template
- core/pom.xml 9 additions, 0 deletionscore/pom.xml
- core/src/main/scala/org/apache/spark/CacheManager.scala 5 additions, 3 deletionscore/src/main/scala/org/apache/spark/CacheManager.scala
- core/src/main/scala/org/apache/spark/SparkContext.scala 12 additions, 10 deletionscore/src/main/scala/org/apache/spark/SparkContext.scala
- core/src/main/scala/org/apache/spark/TaskContext.scala 1 addition, 0 deletionscore/src/main/scala/org/apache/spark/TaskContext.scala
- core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala 3 additions, 1 deletion...src/main/scala/org/apache/spark/deploy/JsonProtocol.scala
- core/src/main/scala/org/apache/spark/executor/Executor.scala 1 addition, 1 deletioncore/src/main/scala/org/apache/spark/executor/Executor.scala
- core/src/main/scala/org/apache/spark/executor/ExecutorSource.scala 3 additions, 2 deletions...main/scala/org/apache/spark/executor/ExecutorSource.scala
- core/src/main/scala/org/apache/spark/metrics/MetricsConfig.scala 3 additions, 4 deletions...c/main/scala/org/apache/spark/metrics/MetricsConfig.scala
- core/src/main/scala/org/apache/spark/metrics/sink/GangliaSink.scala 82 additions, 0 deletions...ain/scala/org/apache/spark/metrics/sink/GangliaSink.scala
- core/src/main/scala/org/apache/spark/metrics/sink/MetricsServlet.scala 7 additions, 4 deletions.../scala/org/apache/spark/metrics/sink/MetricsServlet.scala
- core/src/main/scala/org/apache/spark/network/netty/ShuffleSender.scala 2 additions, 1 deletion.../scala/org/apache/spark/network/netty/ShuffleSender.scala
- core/src/main/scala/org/apache/spark/rdd/RDD.scala 17 additions, 0 deletionscore/src/main/scala/org/apache/spark/rdd/RDD.scala
- core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala 10 additions, 2 deletions.../main/scala/org/apache/spark/scheduler/DAGScheduler.scala
- core/src/main/scala/org/apache/spark/scheduler/DAGSchedulerSource.scala 4 additions, 2 deletions...scala/org/apache/spark/scheduler/DAGSchedulerSource.scala
- core/src/main/scala/org/apache/spark/scheduler/ResultTask.scala 3 additions, 3 deletions...rc/main/scala/org/apache/spark/scheduler/ResultTask.scala
- core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala 1 addition, 1 deletion...ain/scala/org/apache/spark/scheduler/ShuffleMapTask.scala
- core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterScheduler.scala 1 addition, 1 deletion...org/apache/spark/scheduler/cluster/ClusterScheduler.scala
Loading
Please register or sign in to comment