[openstack-dev] [devstack] [neutron] Procedure for back-porting a bug fix to stable/liberty branch of a Neutron script in DevStack?

Mike Spreitzer mspreitz at us.ibm.com
Mon Jan 4 21:34:38 UTC 2016


> From: Kyle Mestery <mestery at mestery.com>
> To: "OpenStack Development Mailing List (not for usage questions)" 
> <openstack-dev at lists.openstack.org>
> Date: 01/03/2016 02:15 PM
> Subject: Re: [openstack-dev] [devstack] [neutron] Procedure for 
> back-porting a bug fix to stable/liberty branch of a Neutron script 
> in DevStack?
> 
> On Sun, Jan 3, 2016 at 4:01 PM, Mike Spreitzer <mspreitz at us.ibm.com> 
wrote:
> I would like to back-port https://review.openstack.org/#/c/242721/
> --- which fixed https://bugs.launchpad.net/devstack/+bug/1469596--- 
> to stable/liberty.  I have contributed to main line development 
> before, but not stable branches.  I see that http://
> docs.openstack.org/infra/manual/developers.htmldoes not specifically
> address this case.  What is the procedure to follow?

> The best place to look is in the project team guide [1], 
> specifically the section on proposing fixes.
> 
> [1] http://docs.openstack.org/project-team-guide/stable-branches.html
> [2] 
http://docs.openstack.org/project-team-guide/stable-branches.html#proposing-fixes


Reference [2] says I should

        $ git checkout stable/tango

but that doesn't work.  Here is a typescript of how it goes wrong:

mjs10:devstack mspreitz$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean

mjs10:devstack mspreitz$ git pull
Already up-to-date.

mjs10:devstack mspreitz$ git remote -v
gerrit 
ssh://mspreitz@review.openstack.org:29418/openstack-dev/devstack.git 
(fetch)
gerrit 
ssh://mspreitz@review.openstack.org:29418/openstack-dev/devstack.git 
(push)
origin  https://github.com/openstack-dev/devstack.git (fetch)
origin  https://github.com/openstack-dev/devstack.git (push)

mjs10:devstack mspreitz$ git checkout stable/liberty
error: pathspec 'stable/liberty' did not match any file(s) known to git.



-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20160104/df1d08fe/attachment.html>


More information about the OpenStack-dev mailing list