Repository: spark Updated Branches: refs/heads/branch-1.0 502a8f795 -> a5848d325
SPARK-1944 Document --verbose in spark-shell -h https://issues.apache.org/jira/browse/SPARK-1944 Author: Andrew Ash <and...@andrewash.com> Closes #1020 from ash211/SPARK-1944 and squashes the following commits: a831c4d [Andrew Ash] SPARK-1944 Document --verbose in spark-shell -h (cherry picked from commit 35630c86ff0e27862c9d902887eb0a24d25867ae) Signed-off-by: Reynold Xin <r...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a5848d32 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a5848d32 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a5848d32 Branch: refs/heads/branch-1.0 Commit: a5848d325ae0909072800cbb3ea9ad73a3708965 Parents: 502a8f7 Author: Andrew Ash <and...@andrewash.com> Authored: Mon Jun 9 10:21:21 2014 -0700 Committer: Reynold Xin <r...@apache.org> Committed: Mon Jun 9 10:21:45 2014 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a5848d32/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala index 153eee3..f1032ea 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkSubmitArguments.scala @@ -360,6 +360,9 @@ private[spark] class SparkSubmitArguments(args: Seq[String]) { | | --executor-memory MEM Memory per executor (e.g. 1000M, 2G) (Default: 1G). | + | --help, -h Show this help message and exit + | --verbose, -v Print additional debug output + | | Spark standalone with cluster deploy mode only: | --driver-cores NUM Cores for driver (Default: 1). | --supervise If given, restarts the driver on failure.