Repository: spark Updated Branches: refs/heads/master bce00dac4 -> 32e27df41
[HOTFIX] Bug in merge script Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/32e27df4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/32e27df4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/32e27df4 Branch: refs/heads/master Commit: 32e27df412706b30daf41f9d46c5572bb9a41bdb Parents: bce00da Author: Patrick Wendell <patr...@databricks.com> Authored: Wed May 13 17:55:06 2015 -0700 Committer: Patrick Wendell <patr...@databricks.com> Committed: Wed May 13 17:55:06 2015 -0700 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/32e27df4/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index f952c9d..1c126f5 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) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
