diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-04-27 15:45:17 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-27 15:51:53 -0700 |
| commit | 3d9fb09681308abd2066d0d02f2438f5a17c9dd9 (patch) | |
| tree | fb04280887ccc5b81d6d0fdc02bff89d0c5154b0 | |
| parent | eefb90d382747c29d7537630ed5ad2c783bb8263 (diff) | |
| download | spark-3d9fb09681308abd2066d0d02f2438f5a17c9dd9.tar.gz spark-3d9fb09681308abd2066d0d02f2438f5a17c9dd9.tar.bz2 spark-3d9fb09681308abd2066d0d02f2438f5a17c9dd9.zip | |
HOTFIX: Minor patch to merge script.
| -rwxr-xr-x | dev/merge_spark_pr.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |