Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/90ab55fd Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/90ab55fd Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/90ab55fd Branch: refs/heads/master Commit: 90ab55fd379a89f4bce7d8420599d704093aa3f3 Parents: e178ae4 fc26e5b Author: Mosharaf Chowdhury <mosha...@cs.berkeley.edu> Authored: Thu Oct 17 18:12:28 2013 -0700 Committer: Mosharaf Chowdhury <mosha...@cs.berkeley.edu> Committed: Thu Oct 17 18:12:28 2013 -0700 ---------------------------------------------------------------------- bin/slaves.sh | 19 ++++++++++++++++++- bin/spark-daemon.sh | 21 ++++++++++++++++++++- bin/spark-daemons.sh | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
