Commit 9f79fd89 authored 11 years ago by Tathagata Das

Merge branch 'apache-master' into filestream-fix

parents 0af7f84c d63856c3

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

core/src/main/scala/org/apache/spark/MapOutputTracker.scala 2 additions, 3 deletions

core/src/main/scala/org/apache/spark/MapOutputTracker.scala
core/src/main/scala/org/apache/spark/api/java/JavaRDD.scala 2 additions, 0 deletions

core/src/main/scala/org/apache/spark/api/java/JavaRDD.scala
core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala 11 additions, 0 deletions

...rc/main/scala/org/apache/spark/api/java/JavaRDDLike.scala
core/src/main/scala/org/apache/spark/api/python/PythonRDD.scala 0 additions, 4 deletions

...rc/main/scala/org/apache/spark/api/python/PythonRDD.scala
core/src/main/scala/org/apache/spark/deploy/client/Client.scala 3 additions, 3 deletions

...rc/main/scala/org/apache/spark/deploy/client/Client.scala
core/src/main/scala/org/apache/spark/deploy/master/Master.scala 6 additions, 21 deletions

...rc/main/scala/org/apache/spark/deploy/master/Master.scala
core/src/main/scala/org/apache/spark/deploy/master/SparkZooKeeperSession.scala 6 additions, 5 deletions

...rg/apache/spark/deploy/master/SparkZooKeeperSession.scala
core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperLeaderElectionAgent.scala 2 additions, 2 deletions

...he/spark/deploy/master/ZooKeeperLeaderElectionAgent.scala
core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala 5 additions, 9 deletions

...a/org/apache/spark/deploy/master/ui/ApplicationPage.scala
core/src/main/scala/org/apache/spark/deploy/master/ui/IndexPage.scala 6 additions, 10 deletions

...n/scala/org/apache/spark/deploy/master/ui/IndexPage.scala
core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala 3 additions, 7 deletions

...scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala
core/src/main/scala/org/apache/spark/deploy/worker/ui/IndexPage.scala 2 additions, 2 deletions

...n/scala/org/apache/spark/deploy/worker/ui/IndexPage.scala
core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala 3 additions, 7 deletions

...scala/org/apache/spark/deploy/worker/ui/WorkerWebUI.scala
core/src/main/scala/org/apache/spark/executor/Executor.scala 8 additions, 4 deletions

core/src/main/scala/org/apache/spark/executor/Executor.scala
core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala 5 additions, 0 deletions

...rc/main/scala/org/apache/spark/executor/TaskMetrics.scala
core/src/main/scala/org/apache/spark/scheduler/TaskResult.scala 10 additions, 10 deletions

...rc/main/scala/org/apache/spark/scheduler/TaskResult.scala
core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala 4 additions, 6 deletions

...ark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
core/src/main/scala/org/apache/spark/storage/BlockManagerMaster.scala 4 additions, 3 deletions

...n/scala/org/apache/spark/storage/BlockManagerMaster.scala
core/src/main/scala/org/apache/spark/storage/BlockManagerMasterActor.scala 4 additions, 7 deletions

...la/org/apache/spark/storage/BlockManagerMasterActor.scala
core/src/main/scala/org/apache/spark/ui/exec/ExecutorsUI.scala 29 additions, 2 deletions

...src/main/scala/org/apache/spark/ui/exec/ExecutorsUI.scala

with 115 additions and 105 deletions

Please register or to comment