summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2021-09-20 12:12:24 -0700
committerGitHub <noreply@github.com>2021-09-20 12:12:24 -0700
commit8a343cbccc274f9b7fc75f970beaee63f4c5c632 (patch)
treef7027c4264544f47f28f20d4bbde28a42d52c849
parent9b38820fa993a11afe8a90bbc7ea4268f85c5df2 (diff)
parentc2bef44264eb92b938ac00d95b2bade73a698274 (diff)
Merge pull request #6031 from aojea/reword_alpha_cherry_picks
cherry-pick policy for alpha features
-rw-r--r--contributors/devel/sig-release/cherry-picks.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/contributors/devel/sig-release/cherry-picks.md b/contributors/devel/sig-release/cherry-picks.md
index 012a95ae..bf843a3b 100644
--- a/contributors/devel/sig-release/cherry-picks.md
+++ b/contributors/devel/sig-release/cherry-picks.md
@@ -42,10 +42,8 @@ Again, the emphasis is on critical bug fixes, e.g.,
- Panic, crash, hang
- Security
-As a counter example, we would not support backporting a bug fix to an alpha
-feature in general. One condition where we would consider is if that bug caused
-an issue for in another part of the system even when the alpha feature was
-switched off / not in use.
+A bugfix for a functional issue (not a data loss or security issue) that only
+affects an alpha feature does not qualify as a critical bug fix.
If you are proposing a cherry pick and it is not a clear and obvious critical
bug fix, please reconsider. If upon reflection you wish to continue, bolster