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 2015/05/29 04:04:38 UTC
spark git commit: [SPARK-7933] Remove Patrick's username/pw from
merge script
Repository: spark
Updated Branches:
refs/heads/master ee6a0e12f -> 66c49ed60
[SPARK-7933] Remove Patrick's username/pw from merge script
Looks like this was added by accident when pwendell merged a commit back in September: fe2b1d6a209db9fe96b1c6630677955b94bd48c9
Author: Kay Ousterhout <ka...@gmail.com>
Closes #6485 from kayousterhout/SPARK-7933 and squashes the following commits:
7c6164a [Kay Ousterhout] [SPARK-7933] Remove Patrick's username/pw from merge script
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/66c49ed6
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/66c49ed6
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/66c49ed6
Branch: refs/heads/master
Commit: 66c49ed60dcef48a6b38ae2d2c4c479933f3aa19
Parents: ee6a0e1
Author: Kay Ousterhout <ka...@gmail.com>
Authored: Thu May 28 19:04:32 2015 -0700
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Thu May 28 19:04:32 2015 -0700
----------------------------------------------------------------------
dev/merge_spark_pr.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/66c49ed6/dev/merge_spark_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 787c5cc..cd83b35 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", "pwendell")
+JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "")
# ASF JIRA password
-JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "35500")
+JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "")
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