Comment 48 for bug 1246201

Revision history for this message
Matt Riedemann (mriedem) wrote :

There are some docs here:

https://wiki.openstack.org/wiki/StableBranch#Proposing_Fixes

You want to cherry pick the git hash of the merged change on stable/juno to stable/icehouse using "git cherry-pick -x 7c4be65733e48dcf44bc306ab964fafb71b37774", otherwise there is a 'cherry pick' button in the gerrit UI for the stable/juno backport, you could just use that to propose to stable/icehouse assuming it merges cleanly.

If it doesn't backport cleanly you have to do it manually and resolve conflicts and make sure the tests pass.