Yes. it works. Maybe we should add this into develop doc. thanks Paul.
On Thu, Nov 17, 2016 at 11:00 PM, Paul Bourke <[email protected]> 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 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 I > think it will work. > > Here's an example using a recent change that just merged into kolla-ansible: > > git clone https://github.com/openstack/kolla > cd kolla > git remote add kolla-ansible https://github.com/openstack/kolla-ansible > git fetch kolla-ansible > git checkout stable/newton > git cherry-pick -x 43517f48f5ab2b9d8fb22dc2a619b8d9f4f494d0 > > -Paul > > > On 17/11/16 14:02, Jeffrey Zhang wrote: >> >> 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 branch? i.e. cross-repository backport. >> >> Does any guy have a solution for this case? >> >> -- >> Regards, >> Jeffrey Zhang >> Blog: http://xcodest.me >> >> __________________________________________________________________________ >> OpenStack Development Mailing List (not for usage questions) >> Unsubscribe: [email protected]?subject:unsubscribe >> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev >> > > __________________________________________________________________________ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: [email protected]?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev -- Regards, Jeffrey Zhang Blog: http://xcodest.me __________________________________________________________________________ OpenStack Development Mailing List (not for usage questions) Unsubscribe: [email protected]?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
