You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/09/15 19:58:29 UTC
git commit: [SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
Repository: spark
Updated Branches:
refs/heads/master cc1464446 -> fe2b1d6a2
[SPARK-3425] do not set MaxPermSize for OpenJDK 1.8
Closes #2387
Author: Matthew Farrellee <ma...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fe2b1d6a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fe2b1d6a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fe2b1d6a
Branch: refs/heads/master
Commit: fe2b1d6a209db9fe96b1c6630677955b94bd48c9
Parents: cc14644
Author: Matthew Farrellee <ma...@redhat.com>
Authored: Mon Sep 15 10:57:53 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Sep 15 10:57:59 2014 -0700
----------------------------------------------------------------------
bin/spark-class | 2 +-
dev/merge_spark_pr.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/fe2b1d6a/bin/spark-class
----------------------------------------------------------------------
diff --git a/bin/spark-class b/bin/spark-class
index 5f5f9ea..613dc9c 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
http://git-wip-us.apache.org/repos/asf/spark/blob/fe2b1d6a/dev/merge_spark_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index d48c8bd..a8e92e3 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"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org