Repository: spark Updated Branches: refs/heads/branch-1.0 3c6c6c265 -> 99285d064
HOTFIX: Minor patch to merge script. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/99285d06 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/99285d06 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/99285d06 Branch: refs/heads/branch-1.0 Commit: 99285d064fc741e9a989432dd075d09522fc25a7 Parents: 3c6c6c2 Author: Patrick Wendell <[email protected]> Authored: Sun Apr 27 15:45:17 2014 -0700 Committer: Patrick Wendell <[email protected]> Committed: Sun Apr 27 15:52:26 2014 -0700 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/99285d06/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index 8d15c05..83618c8 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -237,7 +237,7 @@ def resolve_jira(title, merge_branches, comment): # only consider the release branch to be the fix version. E.g. it is not valid to have # both 1.1.0 and 1.0.0 as fix versions. (major, minor, patch) = v.split(".") - if patch == 0: + if patch == "0": previous = "%s.%s.%s" % (major, int(minor) - 1, 0) if previous in default_fix_versions: default_fix_versions = filter(lambda x: x != v, default_fix_versions)
