aboutsummaryrefslogtreecommitdiff
path: root/dev/merge_spark_pr.py
diff options
context:
space:
mode:
authorPatrick Wendell <pwendell@gmail.com>2014-06-26 17:09:24 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-06-26 17:09:24 -0700
commitf1f7385a5087a80c936d419699e3f5232455f189 (patch)
tree570abb589c5310cd92ad836a0ebf1feb57e5774a /dev/merge_spark_pr.py
parent62d4a0fa9947e64c1533f66ae577557bcfb271c9 (diff)
downloadspark-f1f7385a5087a80c936d419699e3f5232455f189.tar.gz
spark-f1f7385a5087a80c936d419699e3f5232455f189.tar.bz2
spark-f1f7385a5087a80c936d419699e3f5232455f189.zip
Strip '@' symbols when merging pull requests.
Currently all of the commits with 'X' in them cause person X to receive e-mails every time someone makes a public fork of Spark. marmbrus who requested this. Author: Patrick Wendell <pwendell@gmail.com> Closes #1239 from pwendell/strip and squashes the following commits: 22e5a97 [Patrick Wendell] Strip '@' symbols when merging pull requests.
Diffstat (limited to 'dev/merge_spark_pr.py')
-rwxr-xr-xdev/merge_spark_pr.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index ffb70096d6..c44320239b 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -130,7 +130,9 @@ def merge_pr(pr_num, target_ref):
merge_message_flags += ["-m", title]
if body != None:
- merge_message_flags += ["-m", body]
+ # We remove @ symbols from the body to avoid triggering e-mails
+ # to people every time someone creates a public fork of Spark.
+ merge_message_flags += ["-m", body.replace("@", "")]
authors = "\n".join(["Author: %s" % a for a in distinct_authors])