[3/3] git commit: Merge pull request #323 from tgravescs/sparkconf_yarn_fix

[pw...@apache.org]

Merge pull request #323 from tgravescs/sparkconf_yarn_fix

fix spark on yarn after the sparkConf changes

This fixes it so that spark on yarn now compiles and works after the sparkConf changes.

There are also other issues I discovered along the way that are broken:
- mvn builds for yarn don't assemble correctly
- unset SPARK_EXAMPLES_JAR isn't handled properly anymore
- I'm pretty sure spark.conf doesn't actually work as its not distributed with yarn

those things can be fixed in separate pr unless others disagree.


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/498a5f0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/498a5f0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/498a5f0a

Branch: refs/heads/master
Commit: 498a5f0a1c6e82a33c2ad8c48b68bbdb8da57a95
Parents: 0475ca8 fced788
Author: Patrick Wendell <pw...@gmail.com>
Authored: Thu Jan 2 19:06:40 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Thu Jan 2 19:06:40 2014 -0800

----------------------------------------------------------------------
 .../spark/deploy/yarn/ApplicationMaster.scala   | 52 ++++++------------
 .../org/apache/spark/deploy/yarn/Client.scala   | 10 ++--
 .../spark/deploy/yarn/ClientArguments.scala     |  3 +-
 .../spark/deploy/yarn/WorkerLauncher.scala      | 13 +++--
 .../deploy/yarn/YarnAllocationHandler.scala     | 27 ++++++----
 .../spark/deploy/yarn/ApplicationMaster.scala   | 55 +++++++-------------
 .../org/apache/spark/deploy/yarn/Client.scala   | 10 ++--
 .../spark/deploy/yarn/ClientArguments.scala     |  3 +-
 .../spark/deploy/yarn/WorkerLauncher.scala      | 16 +++---
 .../deploy/yarn/YarnAllocationHandler.scala     | 25 +++++----
 10 files changed, 101 insertions(+), 113 deletions(-)
----------------------------------------------------------------------