openstack/governance
Code Issues Proposed changes

Move note closer to amended text

Browse Source 
Change Iecc9751091285a5d3c amended resolution 2023-07-24, but left
a note in the original resolution that is far enough away from the
amended point to be confusing.  So move it to a better location.

Also put the reference list into a line block so it displays
as intended.

These are formatting changes only; there's no change to the text.

Change-Id: Ide5068e20725cf46e3204c0fc3b2c84d99c8ba80
This commit is contained in:
Brian Rosmaita 2023-11-30 08:19:28 -05:00
parent ceadfb2d44
commit 4adb8f6651
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resolutions/20230724-unmaintained-branches.rst
View File

@ -60,21 +60,21 @@ around the responsibilities and defining clearer processes.
Unmaintained branches Unmaintained branches
--------------------- ---------------------
.. _20231114-amend-note:
.. note::
The fourth point below has been amended by a subsequent resolution.
See :doc:`20231114-amend-unmaintained-status` for details.
- The phase of Extended Maintenance for a branch is renamed to Unmaintained. - The phase of Extended Maintenance for a branch is renamed to Unmaintained.
- Only SLURP releases are eligible for having an Unmaintained branch. - Only SLURP releases are eligible for having an Unmaintained branch.
- After a branch is no longer officially maintained, the branch is deleted and - After a branch is no longer officially maintained, the branch is deleted and
a new branch is created under unmaintained/<branch_name>, for example, a new branch is created under unmaintained/<branch_name>, for example,
unmaintained/train. unmaintained/train.
.. _20231114-amend-note:
- A group in Gerrit called "<project>-unmaintained-core", for example, - A group in Gerrit called "<project>-unmaintained-core", for example,
"keystone-unmaintained-core", will have +2/+W on these branches. This group "keystone-unmaintained-core", will have +2/+W on these branches. This group
may be bootstrapped with or include the "<project>-stable-maint" group, but may be bootstrapped with or include the "<project>-stable-maint" group, but
membership is separate from that group. membership is separate from that group.
.. note::
The above point has been amended by a subsequent resolution.
See :doc:`20231114-amend-unmaintained-status` for details.
- The PTL, or a new Unmaintained branch liaison assigned by the PTL, makes - The PTL, or a new Unmaintained branch liaison assigned by the PTL, makes
group membership decisions for "<project>-unmaintained-core". group membership decisions for "<project>-unmaintained-core".
- No SLURP branches may be skipped between the oldest unmaintained branch - No SLURP branches may be skipped between the oldest unmaintained branch
@ -108,6 +108,6 @@ The first SLURP release is 2023.1.
- The unmaintained branch liaison needs to opt-in to keep more than 3 branches - The unmaintained branch liaison needs to opt-in to keep more than 3 branches
(instead of 1 for SLURP) and the guidelines for opt-in described above apply. (instead of 1 for SLURP) and the guidelines for opt-in described above apply.
[0]. https://governance.openstack.org/tc/resolutions/20180301-stable-branch-eol.html | [0]. https://governance.openstack.org/tc/resolutions/20180301-stable-branch-eol.html
[1]. https://lists.openstack.org/pipermail/openstack-discuss/2023-June/033980.html | [1]. https://lists.openstack.org/pipermail/openstack-discuss/2023-June/033980.html
[2]. https://etherpad.opendev.org/p/vancouver-2023-em | [2]. https://etherpad.opendev.org/p/vancouver-2023-em