spark git commit: [SPARK-7592] Always set resolution to "Fixed" in PR merge script.

[pw...@apache.org]

Repository: spark
Updated Branches:
  refs/heads/master 247b70349 -> 1b9e434b6


[SPARK-7592] Always set resolution to "Fixed" in PR merge script.

The issue is that the behavior of the ASF JIRA silently
changed. Now when the "Resolve Issue" transition occurs,
the default resolution is "Pending Closed". We used to
count on the default behavior being to set the
resolution as "Fixed".

The solution is to explicitly set the resolution as "Fixed" and not
count on default behavior.

Author: Patrick Wendell <pa...@databricks.com>

Closes #6103 from pwendell/merge-script-fix and squashes the following commits:

dcc16a6 [Patrick Wendell] Always set resolution to "Fixed" in PR merge script.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1b9e434b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1b9e434b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1b9e434b

Branch: refs/heads/master
Commit: 1b9e434b6c19f23a01e9875a3c1966cd03ce8e2d
Parents: 247b703
Author: Patrick Wendell <pa...@databricks.com>
Authored: Tue May 12 18:20:54 2015 -0700
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Tue May 12 18:20:54 2015 -0700

----------------------------------------------------------------------
 dev/merge_spark_pr.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1b9e434b/dev/merge_spark_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index b69cd15..f952c9d 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -265,8 +265,11 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
     jira_fix_versions = map(lambda v: get_version_json(v), fix_versions)
 
     resolve = filter(lambda a: a['name'] == "Resolve Issue", asf_jira.transitions(jira_id))[0]
+    resolution = filter(lambda r: r.raw['name'] == "Fixed", asf_jira.resolutions())[0]
+    custom_fields = {'resolution': {'id': resolution.raw['id']}}
     asf_jira.transition_issue(
-        jira_id, resolve["id"], fixVersions=jira_fix_versions, comment=comment)
+        jira_id, resolve["id"], fixVersions = jira_fix_versions, 
+        comment = comment, fields = custom_fields)
 
     print "Successfully resolved %s with fixVersions=%s!" % (jira_id, fix_versions)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org