On Fri, May 14, 2021 at 10:41 PM Előd Illés <elod.illes@est.tech> wrote:

Hi teams in $SUBJECT,

during the deletion of $series-eol tagged branches it turned out that
the below listed branches / repositories contains merged patches on top
of $series-eol tag. The issue is with this that whenever the branch is
deleted only the $series-eol (and other) tags can be checked out, so the
changes that were merged after the eol tags, will be *lost*.

There are two options now:

1. Create another tag (something like: "$series-eol-extra"), so that the
extra patches will not be lost completely, because they can be checked
out with the newly created tags

2. Delete the branch anyway and don't care about the lost patch(es)

Here are the list of such branches, please consider which option is good
for the team and reply to this mail:

openstack/octavia
* stable/stein has patches on top of the stein-eol tag
* stable/queens has patches on top of the queens-eol tag

As discussed during today's Octavia weekly meeting, we agreed to delete those branches.

Those patches shouldn't have been backported here.

Thanks,

openstack/kolla
* stable/pike has patches on top of the pike-eol tag
* stable/ocata has patches on top of the ocata-eol tag

openstack/tripleo-common
* stable/rocky has patches on top of the rocky-eol tag

openstack/os-apply-config
* stable/pike has patches on top of the pike-eol tag
* stable/ocata has patches on top of the ocata-eol tag

openstack/os-cloud-config
stable/ocata has patches on top of the ocata-eol tag

Thanks,

Előd