From 5defb3c644f4a1e254b8c9ecbd9da8f87b99642b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 22 Feb 2023 10:30:49 +0800 Subject: [PATCH 1/2] fix --- CONTRIBUTING.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a23448e0ab55..20c52fba9a6ec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -299,9 +299,7 @@ known as the release freeze. All the feature pull requests should be merged before feature freeze. And, during the frozen period, a corresponding release branch is open for fixes backported from main branch. Release candidates are made during this period for user testing to -obtain a final version that is maintained in this branch. A release is -maintained by issuing patch releases to only correct critical problems -such as crashes or security issues. +obtain a final version that is maintained in this branch. Major release cycles are seasonal. They always begin on the 25th and end on the 24th (i.e., the 25th of December to March 24th). @@ -311,6 +309,15 @@ for the previous version. For example, if the latest, published release is v1.2, then minor changes for the previous release—e.g., v1.1.0 -> v1.1.1—are still possible. +The previous release gets fixes for: +* Security issues +* Critical bugs +* Regressions +* Build issues +* Necessary enhancements (including necessary UI/UX fixes) + +The backported fixes should avoid breaking downgrade between minor releases as much as possible. + ## Maintainers To make sure every PR is checked, we have [team From 774a4a2eab091727bdaa719122a50f38a27a5688 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 22 Feb 2023 10:37:18 +0800 Subject: [PATCH 2/2] fix --- CONTRIBUTING.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 20c52fba9a6ec..2cea0a4c5700d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -310,11 +310,12 @@ v1.2, then minor changes for the previous release—e.g., v1.1.0 -> v1.1.1—are still possible. The previous release gets fixes for: -* Security issues -* Critical bugs -* Regressions -* Build issues -* Necessary enhancements (including necessary UI/UX fixes) + +- Security issues +- Critical bugs +- Regressions +- Build issues +- Necessary enhancements (including necessary UI/UX fixes) The backported fixes should avoid breaking downgrade between minor releases as much as possible.