This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/spark-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new cc6549b Fix the default branch name to `main`
cc6549b is described below
commit cc6549bcc6666414f9b0aad8aa9310756798eded
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Fri Mar 29 15:10:40 2024 -0700
Fix the default branch name to `main`
---
dev/merge_spark_pr.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index cd1c864..4647383 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -311,7 +311,7 @@ def resolve_jira_issue(merge_branches, comment,
default_jira_id=""):
default_fix_versions = []
for b in merge_branches:
- if b == "master":
+ if b == "main":
default_fix_versions.append(versions[0].name)
else:
found = False
@@ -334,7 +334,7 @@ def resolve_jira_issue(merge_branches, comment,
default_jira_id=""):
for v in default_fix_versions:
# Handles the case where we have forked a release branch but not yet
made the release.
- # In this case, if the PR is committed to the master branch and the
release branch, we
+ # In this case, if the PR is committed to the main branch and the
release branch, we
# 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(".")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
