aboutsummaryrefslogtreecommitdiff
path: root/dev/merge_spark_pr.py
diff options
context:
space:
mode:
Diffstat (limited to 'dev/merge_spark_pr.py')
-rwxr-xr-xdev/merge_spark_pr.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index b69cd15f99..f952c9d0b1 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)