diff options
| author | Patrick Wendell <patrick@databricks.com> | 2015-05-13 17:55:06 -0700 |
|---|---|---|
| committer | Patrick Wendell <patrick@databricks.com> | 2015-05-13 17:55:06 -0700 |
| commit | 32e27df412706b30daf41f9d46c5572bb9a41bdb (patch) | |
| tree | c6ec73d375b4ee5d37621ea61227d700133728f4 /dev/merge_spark_pr.py | |
| parent | bce00dac403d3be2be59218b7b93a56c34c68f1a (diff) | |
| download | spark-32e27df412706b30daf41f9d46c5572bb9a41bdb.tar.gz spark-32e27df412706b30daf41f9d46c5572bb9a41bdb.tar.bz2 spark-32e27df412706b30daf41f9d46c5572bb9a41bdb.zip | |
[HOTFIX] Bug in merge script
Diffstat (limited to 'dev/merge_spark_pr.py')
| -rwxr-xr-x | dev/merge_spark_pr.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index f952c9d0b1..1c126f50bf 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -266,10 +266,9 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""): 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, fields = custom_fields) + comment = comment, resolution = {'id': resolution.raw['id']}) print "Successfully resolved %s with fixVersions=%s!" % (jira_id, fix_versions) |