Repository: spark Updated Branches: refs/heads/branch-1.6 c6c9bf99a -> 5987b1658
[SPARK-12499][BUILD] don't force MAVEN_OPTS allow the user to override MAVEN_OPTS (2GB wasn't sufficient for me) Author: Adrian Bridgett <[email protected]> Closes #10448 from abridgett/feature/do_not_force_maven_opts. (cherry picked from commit ead6abf7e7fc14b451214951d4991d497aa65e63) Signed-off-by: Josh Rosen <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5987b165 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5987b165 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5987b165 Branch: refs/heads/branch-1.6 Commit: 5987b1658b837400691160c38ba6eedc47274ee4 Parents: c6c9bf9 Author: Adrian Bridgett <[email protected]> Authored: Wed Dec 23 16:00:03 2015 -0800 Committer: Josh Rosen <[email protected]> Committed: Wed Dec 23 16:01:27 2015 -0800 ---------------------------------------------------------------------- make-distribution.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/5987b165/make-distribution.sh ---------------------------------------------------------------------- diff --git a/make-distribution.sh b/make-distribution.sh index c949e94..48c7c8b 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -162,7 +162,7 @@ fi # Build uber fat JAR cd "$SPARK_HOME" -export MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m" +export MAVEN_OPTS="${MAVEN_OPTS:--Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m}" # Store the command as an array because $MVN variable might have spaces in it. # Normal quoting tricks don't work. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
