You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/23 03:58:16 UTC

[4/4] git commit: Merge pull request #447 from CodingCat/SPARK-1027

Merge pull request #447 from CodingCat/SPARK-1027

fix for SPARK-1027

fix for SPARK-1027  (https://spark-project.atlassian.net/browse/SPARK-1027)

FIXES

1. change sparkhome from String to Option(String) in ApplicationDesc

2. remove sparkhome parameter in LaunchExecutor message

3. adjust involved files


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

Branch: refs/heads/master
Commit: 034dce2a7e0537836e15b9bfecc333b28fc76a6a
Parents: 3184fac 2b3c461
Author: Patrick Wendell <pw...@gmail.com>
Authored: Wed Jan 22 18:58:02 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Wed Jan 22 18:58:02 2014 -0800

----------------------------------------------------------------------
 .../spark/deploy/ApplicationDescription.scala   |  2 +-
 .../org/apache/spark/deploy/DeployMessage.scala |  3 +-
 .../apache/spark/deploy/client/TestClient.scala |  2 +-
 .../org/apache/spark/deploy/master/Master.scala |  8 ++--
 .../org/apache/spark/deploy/worker/Worker.scala | 41 +++++++++++++-------
 .../cluster/SparkDeploySchedulerBackend.scala   |  2 +-
 .../apache/spark/deploy/JsonProtocolSuite.scala |  2 +-
 .../deploy/worker/ExecutorRunnerTest.scala      |  4 +-
 8 files changed, 37 insertions(+), 27 deletions(-)
----------------------------------------------------------------------