You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2013/11/20 19:36:15 UTC
[3/4] git commit: Merge branch 'master' into removesemicolonscala
Merge branch 'master' into removesemicolonscala
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/43dfac51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/43dfac51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/43dfac51
Branch: refs/heads/master
Commit: 43dfac51324778d3f6df3de2cbd6fb223251774c
Parents: 10be58f f568912
Author: Henry Saputra <he...@platfora.com>
Authored: Tue Nov 19 16:57:57 2013 -0800
Committer: Henry Saputra <he...@platfora.com>
Committed: Tue Nov 19 16:57:57 2013 -0800
----------------------------------------------------------------------
.../cluster/CoarseGrainedSchedulerBackend.scala | 1 +
.../cluster/SimrSchedulerBackend.scala | 1 -
.../org/apache/spark/ui/exec/ExecutorsUI.scala | 23 ++++++------
docs/running-on-yarn.md | 2 +
.../apache/spark/examples/BroadcastTest.scala | 10 ++---
.../spark/examples/MultiBroadcastTest.scala | 15 +++++---
.../spark/deploy/yarn/ApplicationMaster.scala | 39 +++++++++++++-------
.../org/apache/spark/deploy/yarn/Client.scala | 32 ++++++++++------
.../deploy/yarn/YarnAllocationHandler.scala | 16 ++++++--
9 files changed, 87 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/43dfac51/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/43dfac51/yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
----------------------------------------------------------------------