Skip to content
Snippets Groups Projects
Commit fe2b1d6a authored by Matthew Farrellee's avatar Matthew Farrellee Committed by Patrick Wendell
Browse files

[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
parent cc146444
No related branches found
No related tags found
No related merge requests found
...@@ -105,7 +105,7 @@ else ...@@ -105,7 +105,7 @@ else
exit 1 exit 1
fi fi
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 # Set JAVA_OPTS to be able to load native libraries and to set heap size
if [ "$JAVA_VERSION" -ge 18 ]; then if [ "$JAVA_VERSION" -ge 18 ]; then
......
...@@ -44,9 +44,9 @@ PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github") ...@@ -44,9 +44,9 @@ PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github")
# Remote name which points to Apache git # Remote name which points to Apache git
PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache")
# ASF JIRA username # ASF JIRA username
JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "") JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "pwendell")
# ASF JIRA password # 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_BASE = "https://github.com/apache/spark/pull"
GITHUB_API_BASE = "https://api.github.com/repos/apache/spark" GITHUB_API_BASE = "https://api.github.com/repos/apache/spark"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment