From 3d9fb09681308abd2066d0d02f2438f5a17c9dd9 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Sun, 27 Apr 2014 15:45:17 -0700
Subject: [PATCH] HOTFIX: Minor patch to merge script.
---
dev/merge_spark_pr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 8d15c05d50..83618c8068 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)
--
GitLab