diff options
author | Matthew Farrellee <matt@redhat.com> | 2014-09-15 10:57:53 -0700 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-09-15 10:57:59 -0700 |
commit | fe2b1d6a209db9fe96b1c6630677955b94bd48c9 (patch) | |
tree | aa3974345f2c3b16e4679982e5e8d276cd098191 | |
parent | cc14644460872efb344e8d895859d70213a40840 (diff) | |
download | spark-fe2b1d6a209db9fe96b1c6630677955b94bd48c9.tar.gz spark-fe2b1d6a209db9fe96b1c6630677955b94bd48c9.tar.bz2 spark-fe2b1d6a209db9fe96b1c6630677955b94bd48c9.zip |
[SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
Closes #2387
Author: Matthew Farrellee <matt@redhat.com>
Closes #2301 from mattf/SPARK-3425 and squashes the following commits:
20f3c09 [Matthew Farrellee] [SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
-rwxr-xr-x | bin/spark-class | 2 | ||||
-rwxr-xr-x | dev/merge_spark_pr.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/spark-class b/bin/spark-class index 5f5f9ea748..613dc9c456 100755 --- a/bin/spark-class +++ b/bin/spark-class @@ -105,7 +105,7 @@ else exit 1 fi fi -JAVA_VERSION=$("$RUNNER" -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') +JAVA_VERSION=$("$RUNNER" -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') # Set JAVA_OPTS to be able to load native libraries and to set heap size if [ "$JAVA_VERSION" -ge 18 ]; then diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index d48c8bde12..a8e92e36fe 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -44,9 +44,9 @@ PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github") # Remote name which points to Apache git PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") # ASF JIRA username -JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "") +JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "pwendell") # ASF JIRA password -JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "") +JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "35500") GITHUB_BASE = "https://github.com/apache/spark/pull" GITHUB_API_BASE = "https://api.github.com/repos/apache/spark" |