Skip to content

Commit fe2b1d6

Browse files
Matthew Farrelleepwendell
authored andcommitted
[SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
Closes apache#2387 Author: Matthew Farrellee <[email protected]> Closes apache#2301 from mattf/SPARK-3425 and squashes the following commits: 20f3c09 [Matthew Farrellee] [SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
1 parent cc14644 commit fe2b1d6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

bin/spark-class

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ else
105105
exit 1
106106
fi
107107
fi
108-
JAVA_VERSION=$("$RUNNER" -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
108+
JAVA_VERSION=$("$RUNNER" -version 2>&1 | sed 's/.* version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
109109

110110
# Set JAVA_OPTS to be able to load native libraries and to set heap size
111111
if [ "$JAVA_VERSION" -ge 18 ]; then

dev/merge_spark_pr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
# Remote name which points to Apache git
4545
PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache")
4646
# ASF JIRA username
47-
JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "")
47+
JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "pwendell")
4848
# ASF JIRA password
49-
JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "")
49+
JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "35500")
5050

5151
GITHUB_BASE = "https://github.com/apache/spark/pull"
5252
GITHUB_API_BASE = "https://api.github.com/repos/apache/spark"

0 commit comments

Comments
 (0)