Repository: spark Updated Branches: refs/heads/master 66a7d6b30 -> ccda75b0d
[SPARK-22921][PROJECT-INFRA] Bug fix in jira assigning Small bug fix from last pr, ran a successful merge with this code. Author: Imran Rashid <iras...@cloudera.com> Closes #20117 from squito/SPARK-22921. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ccda75b0 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ccda75b0 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ccda75b0 Branch: refs/heads/master Commit: ccda75b0d17637abaa7ab54b68e4db8e1a16f2ce Parents: 66a7d6b Author: Imran Rashid <iras...@cloudera.com> Authored: Fri Dec 29 17:07:01 2017 -0600 Committer: Imran Rashid <iras...@cloudera.com> Committed: Fri Dec 29 17:07:01 2017 -0600 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ccda75b0/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index cd5dd1e..57ca840 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -242,8 +242,8 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""): cur_summary = issue.fields.summary cur_assignee = issue.fields.assignee if cur_assignee is None: - cur_assignee = choose_jira_assignee(issue) - # Check again, we might not have chose an assignee + cur_assignee = choose_jira_assignee(issue, asf_jira) + # Check again, we might not have chosen an assignee if cur_assignee is None: cur_assignee = "NOT ASSIGNED!!!" else: --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org