Skip to content

Commit

Permalink
HOTFIX: Minor patch to merge script.
Browse files Browse the repository at this point in the history
  • Loading branch information
pwendell committed Apr 27, 2014
1 parent eefb90d commit 3d9fb09
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dev/merge_spark_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3d9fb09

Please sign in to comment.