[infra][neutron] Requesting help to remove feature branches
Dear Infra Team,
We have decided to remove from the Neutron repo the following feature branches:
feature/graphql feature/lbaasv2 feature/pecan feature/qos
We don't need to preserve any state from these branches. In the case of the first one, no code was merged. The work in the other three branches is already merged into master.
Best regards
Miguel
On Fri, Sep 6, 2019, at 11:24 AM, Miguel Lavalle wrote:
Dear Infra Team,
We have decided to remove from the Neutron repo the following feature branches:
feature/graphql feature/lbaasv2 feature/pecan feature/qos
We don't need to preserve any state from these branches. In the case of the first one, no code was merged. The work in the other three branches is already merged into master.
I forgot to mention that we need to close all the open changes proposed to these branches before we can delete the branch in Gerrit. feature/graphql appears to have some open changes, but the others are fine.
Can you abandon those changes then we can delete the branch.
Thanks, Clark
Hi Clark,
Thanks for the quick respond. Done: https://review.opendev.org/#/q/project:openstack/neutron+branch:feature/grap...
Regards
On Fri, Sep 6, 2019 at 1:36 PM Clark Boylan cboylan@sapwetik.org wrote:
On Fri, Sep 6, 2019, at 11:24 AM, Miguel Lavalle wrote:
Dear Infra Team,
We have decided to remove from the Neutron repo the following feature
branches:
feature/graphql feature/lbaasv2 feature/pecan feature/qos
We don't need to preserve any state from these branches. In the case of the first one, no code was merged. The work in the other three branches is already merged into master.
I forgot to mention that we need to close all the open changes proposed to these branches before we can delete the branch in Gerrit. feature/graphql appears to have some open changes, but the others are fine.
Can you abandon those changes then we can delete the branch.
Thanks, Clark
On Fri, Sep 6, 2019, at 1:44 PM, Miguel Lavalle wrote:
Hi Clark,
Thanks for the quick respond. Done: https://review.opendev.org/#/q/project:openstack/neutron+branch:feature/grap...
And now the branches are gone. For historical papertrails here are the branches and their heads:
feature/graphql ab371ffcc69ab93d1046932297f7029bf7f184e5 feature/lbaasv2 0eed081ad9ef516f0207f179643781aad5b85b8e feature/pecan f747c35b1c1b8371de399c8239699cb89455c6e6 feature/qos 28a4c0aa69924e28f2e302acb9a8313fb310d5bf
Clark
On 2019-09-06 13:24:44 -0500 (-0500), Miguel Lavalle wrote:
We have decided to remove from the Neutron repo the following feature branches:
feature/graphql feature/lbaasv2 feature/pecan feature/qos
We don't need to preserve any state from these branches. In the case of the first one, no code was merged. The work in the other three branches is already merged into master.
Sanity-checking feature/lbaasv2, `git merge-base` between it and master suggest cc400e2 is the closest common ancestor. There are 4 potentially substantive commits on feature/lbaasv2 past that point which do not seem to appear in the master branch history:
7147389 Implement Jinja templates for haproxy config cfa4a86 Tests for extension, db and plugin for LBaaS V2 02c01a3 Plugin/DB additions for version 2 of LBaaS API 4ed8862 New extension for version 2 of LBaaS API
Do you happen to know whether these need to be preserved (or what happened with them)?
Hi,
So we all stay on the same page, the four branches were removed by the infra team. Thanks!. This is the conversation we had in regards to the feature/lbaasv2 branch, where we agreed tht it was not necessary to save any state: http://eavesdrop.openstack.org/irclogs/%23openstack-infra/%23openstack-infra...
Cheers
On Fri, Sep 6, 2019 at 5:58 PM Jeremy Stanley fungi@yuggoth.org wrote:
On 2019-09-06 13:24:44 -0500 (-0500), Miguel Lavalle wrote:
We have decided to remove from the Neutron repo the following feature branches:
feature/graphql feature/lbaasv2 feature/pecan feature/qos
We don't need to preserve any state from these branches. In the case of
the
first one, no code was merged. The work in the other three branches is already merged into master.
Sanity-checking feature/lbaasv2, `git merge-base` between it and master suggest cc400e2 is the closest common ancestor. There are 4 potentially substantive commits on feature/lbaasv2 past that point which do not seem to appear in the master branch history:
7147389 Implement Jinja templates for haproxy config cfa4a86 Tests for extension, db and plugin for LBaaS V2 02c01a3 Plugin/DB additions for version 2 of LBaaS API 4ed8862 New extension for version 2 of LBaaS APIDo you happen to know whether these need to be preserved (or what happened with them)? -- Jeremy Stanley
participants (3)
-
Clark Boylan
-
Jeremy Stanley
-
Miguel Lavalle