You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/04/28 00:52:17 UTC
git commit: HOTFIX: Minor patch to merge script.
Repository: spark
Updated Branches:
refs/heads/master eefb90d38 -> 3d9fb0968
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/3d9fb096
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3d9fb096
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3d9fb096
Branch: refs/heads/master
Commit: 3d9fb09681308abd2066d0d02f2438f5a17c9dd9
Parents: eefb90d
Author: Patrick Wendell <pw...@gmail.com>
Authored: Sun Apr 27 15:45:17 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Sun Apr 27 15:51:53 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/3d9fb096/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)