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/13 02:01:22 UTC

[2/2] git commit: Merge pull request #396 from pwendell/executor-env

Merge pull request #396 from pwendell/executor-env

Setting load defaults to true in executor

This preserves the behavior in earlier releases. If properties are set for the executors via `spark-env.sh` on the slaves, then they should take precedence over spark defaults. This is useful for if system administrators are setting properties for a standalone cluster, such as shuffle locations.

/cc @andrewor14 who initially reported this issue.


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

Branch: refs/heads/master
Commit: 074f50232fd8d8cf05eb88db0ac6f03f61452810
Parents: 82e2b92 cfb1e6c
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Jan 12 17:01:13 2014 -0800
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Jan 12 17:01:13 2014 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/executor/Executor.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------