Repository: spark Updated Branches: refs/heads/branch-1.1 aec20af1f -> e484b8af2
[SPARK-4701] Typo in sbt/sbt Modified typo. Author: Masayoshi TSUZUKI <tsudu...@oss.nttdata.co.jp> Closes #3560 from tsudukim/feature/SPARK-4701 and squashes the following commits: ed2a3f1 [Masayoshi TSUZUKI] Another whitespace position error. 1af3a35 [Masayoshi TSUZUKI] [SPARK-4701] Typo in sbt/sbt (cherry picked from commit 96786e3ee53a13a57463b74bec0e77b172f719a3) Signed-off-by: Andrew Or <and...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e484b8af Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e484b8af Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e484b8af Branch: refs/heads/branch-1.1 Commit: e484b8af2ef59013ee977f9ae3143d258f21786b Parents: aec20af Author: Masayoshi TSUZUKI <tsudu...@oss.nttdata.co.jp> Authored: Wed Dec 3 12:08:00 2014 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Wed Dec 3 12:08:26 2014 -0800 ---------------------------------------------------------------------- sbt/sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e484b8af/sbt/sbt ---------------------------------------------------------------------- diff --git a/sbt/sbt b/sbt/sbt index 1b1aa14..7790aa4 100755 --- a/sbt/sbt +++ b/sbt/sbt @@ -71,8 +71,8 @@ Usage: $script_name [options] -Dkey=val pass -Dkey=val directly to the java runtime -J-X pass option -X directly to the java runtime (-J is stripped) - -S-X add -X to sbt's scalacOptions (-J is stripped) - -PmavenProfiles Enable a maven profile for the build. + -S-X add -X to sbt's scalacOptions (-S is stripped) + -PmavenProfiles Enable a maven profile for the build. In the case of duplicated or conflicting options, the order above shows precedence: JAVA_OPTS lowest, command line options highest. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
