<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<p>Thanks for all the replies, the branches have been deleted.<br>
</p>
<p>Előd</p>
<div class="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix">On 2021. 05. 19. 18:29, Gregory
Thiemonge wrote:<br>
</div>
<blockquote type="cite" cite="mid:CAKsmYT2OiYfOGVsVZNbNfBuhOYZbH6fGoDnCjTJQCKaSGtv4zg@mail.gmail.com">
<div dir="ltr">
<div dir="ltr"><br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Fri, May 14, 2021 at
10:41 PM Előd Illés <a class="moz-txt-link-rfc2396E" href="mailto:elod.illes@est.tech"><elod.illes@est.tech></a> wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">Hi teams in $SUBJECT,<br>
<br>
during the deletion of $series-eol tagged branches it turned
out that <br>
the below listed branches / repositories contains merged
patches on top <br>
of $series-eol tag. The issue is with this that whenever the
branch is <br>
deleted only the $series-eol (and other) tags can be checked
out, so the <br>
changes that were merged after the eol tags, will be *lost*.<br>
<br>
There are two options now:<br>
<br>
1. Create another tag (something like: "$series-eol-extra"),
so that the <br>
extra patches will not be lost completely, because they can
be checked <br>
out with the newly created tags<br>
<br>
2. Delete the branch anyway and don't care about the lost
patch(es)<br>
<br>
Here are the list of such branches, please consider which
option is good <br>
for the team and reply to this mail:<br>
<br>
openstack/octavia<br>
* stable/stein has patches on top of the stein-eol tag<br>
* stable/queens has patches on top of the queens-eol tag<br>
</blockquote>
<div><br>
</div>
<div>As discussed during today's Octavia weekly meeting, we
agreed to delete those branches.</div>
<div>Those patches shouldn't have been backported here.</div>
<div><br>
</div>
<div>Thanks,</div>
<div> </div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">
openstack/kolla<br>
* stable/pike has patches on top of the pike-eol tag<br>
* stable/ocata has patches on top of the ocata-eol tag<br>
<br>
openstack/tripleo-common<br>
* stable/rocky has patches on top of the rocky-eol tag<br>
<br>
openstack/os-apply-config<br>
* stable/pike has patches on top of the pike-eol tag<br>
* stable/ocata has patches on top of the ocata-eol tag<br>
<br>
openstack/os-cloud-config<br>
stable/ocata has patches on top of the ocata-eol tag<br>
<br>
Thanks,<br>
<br>
Előd<br>
<br>
<br>
<br>
</blockquote>
</div>
</div>
</blockquote>
</body>
</html>