From 6f12005bb8b1169c14f72a14b1bc4c8fdce4885a Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Mon, 16 Sep 2019 09:54:54 -0500 Subject: [PATCH] Elaborate on Extended Maintenance to EOL transition This adds a little more wording around end of life for stable branches to make sure it's clear that a team can decide to go directly from EM to EOL without needing to wait 6 months for an "Unmaintained" phase to complete. Also fixes some minor nits while I'm here. Change-Id: I92542012108f0aa07e28968479cdaddf7e06301d Signed-off-by: Sean McGinnis --- doc/source/stable-branches.rst | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/doc/source/stable-branches.rst b/doc/source/stable-branches.rst index ef47cc6..0df52ea 100644 --- a/doc/source/stable-branches.rst +++ b/doc/source/stable-branches.rst @@ -1,6 +1,6 @@ -================= +================ Stable Branches -================= +================ The stable branches are intended to be a safe source of fixes for high impact bugs and security issues which have been fixed on master since a given release. @@ -30,12 +30,12 @@ Project stable branches will be in one of the following states: * All bugfixes (that meet the criteria described below) are appropriate. No Releases produced, reduced CI commitment. - * Unmaintained - * 6 months + * 0 - 6 months * The branch is under Extended Maintenance rules, but there are no - maintainers + maintainers. - * End of Life (EOL) * N/A - * Branch no longer accepting changes + * Branch no longer accepting changes. It is not required that all projects for a given branch transition between phases at the same time. For example it's quite reasonable for the @@ -109,8 +109,9 @@ Maintenance. End of Life ----------- -After a project/branch exceeds the time allocation as `Unmaintained`_, it -will be become End of Life. The HEAD of the appropriate branch will be tagged +After a project/branch exceeds the time allocation as `Unmaintained`, or a team +decides to explicitly end support for a branch, it +will become End of Life. The HEAD of the appropriate branch will be tagged as ``$series-eol`` and the branch deleted. Appropriate Fixes