Repository: spark Updated Branches: refs/heads/branch-1.1 b5dc9b43b -> 4d6a0e920
SPARK-2481: The environment variables SPARK_HISTORY_OPTS is covered in spark-env.sh Author: witgo <[email protected]> Author: GuoQiang Li <[email protected]> Closes #1341 from witgo/history_env and squashes the following commits: b4fd9f8 [GuoQiang Li] review commit 0ebe401 [witgo] *-history-server.sh load spark-config.sh (cherry picked from commit 9f04db17e50568d5580091add9100693177d7c4f) Signed-off-by: Andrew Or <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4d6a0e92 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4d6a0e92 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4d6a0e92 Branch: refs/heads/branch-1.1 Commit: 4d6a0e920974a5d50348ba9f7377b48e43c2da16 Parents: b5dc9b4 Author: witgo <[email protected]> Authored: Mon Aug 25 19:22:27 2014 -0700 Committer: Andrew Or <[email protected]> Committed: Mon Aug 25 19:22:40 2014 -0700 ---------------------------------------------------------------------- sbin/start-history-server.sh | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/4d6a0e92/sbin/start-history-server.sh ---------------------------------------------------------------------- diff --git a/sbin/start-history-server.sh b/sbin/start-history-server.sh index e30493d..580ab47 100755 --- a/sbin/start-history-server.sh +++ b/sbin/start-history-server.sh @@ -27,6 +27,9 @@ sbin=`dirname "$0"` sbin=`cd "$sbin"; pwd` +. "$sbin/spark-config.sh" +. "$SPARK_PREFIX/bin/load-spark-env.sh" + if [ $# != 0 ]; then echo "Using command line arguments for setting the log directory is deprecated. Please " echo "set the spark.history.fs.logDirectory configuration option instead." --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
