Repository: spark Updated Branches: refs/heads/master 99bd50066 -> bc57789bb
SPARK-5776 JIRA version not of form x.y.z breaks merge_spark_pr.py Consider only x.y.z verisons from JIRA. CC JoshRosen who will probably know this script well. Alternative is to call the version "2.0.0" after all in JIRA. Author: Sean Owen <so...@cloudera.com> Closes #4570 from srowen/SPARK-5776 and squashes the following commits: fffafde [Sean Owen] Consider only x.y.z verisons from JIRA Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bc57789b Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bc57789b Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bc57789b Branch: refs/heads/master Commit: bc57789bbb2a4fa7733594d30a5818f048aacfed Parents: 99bd500 Author: Sean Owen <so...@cloudera.com> Authored: Thu Feb 12 20:14:45 2015 +0000 Committer: Sean Owen <so...@cloudera.com> Committed: Thu Feb 12 20:14:45 2015 +0000 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/bc57789b/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index dfa924d..3062e9c 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -244,6 +244,8 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""): versions = asf_jira.project_versions("SPARK") versions = sorted(versions, key=lambda x: x.name, reverse=True) versions = filter(lambda x: x.raw['released'] is False, versions) + # Consider only x.y.z versions + versions = filter(lambda x: re.match('\d+\.\d+\.\d+', x.name), versions) default_fix_versions = map(lambda x: fix_version_from_branch(x, versions).name, merge_branches) for v in default_fix_versions: --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org