On Mar 12, 2015, at 7:11 AM, bhaisaab <g...@git.apache.org> wrote: > Github user bhaisaab commented on the pull request: > > https://github.com/apache/cloudstack/pull/112#issuecomment-78429050 > > @runseb So we've two options: > > I merge this into 4.5 and then a 4.5.1 RC1 candidate is cut off 4.5 > branch. On 4.5 branch there aren't many commits that have went into after > 4.5.0 was cut/released. >
Maybe I missing something, but let's do this option. what I see now is that we vote on a hash in a 4.5 branch branch (the RC branch). And even thought the vote passed, 4.5 branch has not yet been updated to 4.5.1-SNAPSHOT. So in any case -critical bug or not- 4.5 branch needs to be updated with correct version number. > Or, > > I merge this into 4.5 and share only commits that need to be picked on top > of 4.5.0 (tag). That is - I'll create a branch from the 4.5.0 tag and > cherry-pick commits that need to go into the emergency 4.5.1 and use that for > voting? > > Which one do you prefer? > > > --- > If your project is set up for it, you can reply to this email and have your > reply appear on GitHub as well. If your project does not have this feature > enabled and wishes so, or if the feature is enabled but not working, please > contact infrastructure at infrastruct...@apache.org or file a JIRA ticket > with INFRA. > ---
