Re: [openstack-dev] [kolla][git]How to backport commit after repo split

On 2016-11-17 23:10:50 -0500 (-0500), Juan L. Negron wrote: > At some point, it would be good if the kolla-ansible repo is added > as a submodule of the kolla one to simplify things. This already came up here this week in a related thread on the repo split, and then again at the Kolla meeting. I

Re: [openstack-dev] [kolla][git]How to backport commit after repo split

You mean contributing doc? Sounds like a winner to me. I am really concerned about how to sort out back ports as it relates to the repository split, and documenting a best practice here makes a lot of sense (once we figure out what that simple best practice is - which I think is covered in

Re: [openstack-dev] [kolla][git]How to backport commit after repo split

At some point, it would be good if the kolla-ansible repo is added as a submodule of the kolla one to simplify things. Thanks, Juan > On Nov 17, 2016, at 22:19, Jeffrey Zhang wrote: > > Yes. it works. Maybe we should add this into develop doc. > > thanks Paul. > >

Re: [openstack-dev] [kolla][git]How to backport commit after repo split

Yes. it works. Maybe we should add this into develop doc. thanks Paul. On Thu, Nov 17, 2016 at 11:00 PM, Paul Bourke wrote: > Seen as both repos stem from the same codebase, we should be able to just > cherry-pick changes as usual. If a fix comprises of a change to both

Re: [openstack-dev] [kolla][git]How to backport commit after repo split

Seen as both repos stem from the same codebase, we should be able to just cherry-pick changes as usual. If a fix comprises of a change to both kolla and kolla-ansible, it will just mean two cherry-picks. Will need to wait till the relevant pieces are removed from both repos to confirm this but

[openstack-dev] [kolla][git]How to backport commit after repo split

We have split kolla repo into two repos. the dockerfile related code remains in kolla repo which builds images. and the ansible playbook related code is moved into kolla-ansible which deploy the images. But it brings a new challenge. How to backport the kolla-ansible change to kolla in stable