The problem you describe is with our release procedure. We are differentiating/diverting to much before releasing. In this case we do have to make one per release.
On Wed, Nov 19, 2014 at 11:39 AM, Ilia Shakitko <i.shaki...@tech.leaseweb.com> wrote: > Hi @Daan, > > How do I make one patch applicable for the two versions of file with lines > changed in the same place where your patch does changes? (I can only see > n-different patch files, one per different version) > > > Kind regards, > > Ilia Shakitko > Innovation Engineer > LeaseWeb Technologies B.V. > > T: +31 20 316 0235 > M: > E: i.shaki...@tech.leaseweb.com > W: http://www.leaseweb.com > > Luttenbergweg 8, 1101 EC Amsterdam, Netherlands > > > -----Original Message----- > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > Sent: woensdag, 19 november, 2014 11:35 > To: Anshul Gangwar > Cc: Rajesh Battala; cloudstack > Subject: Re: Review Request 28213: CLOUDSTACK-7752: Management Server goes in > infinite loop while creating a vm with tagged local data disk when the pool > is not tagged > > like that it still doesn't apply (on 4.4, it does on 4.3) > > On Wed, Nov 19, 2014 at 11:32 AM, Anshul Gangwar <anshul.gang...@citrix.com> > wrote: > >> This is an automatically generated e-mail. To reply, visit: >> https://reviews.apache.org/r/28213/ >> >> On November 19th, 2014, 9:35 a.m. UTC, *daan Hoogland* wrote: >> >> the patch does not apply to 4.4, Can you have a look? >> >> On November 19th, 2014, 10:01 a.m. UTC, *daan Hoogland* wrote: >> >> I tried applying to 4.3 as well. it failed too >> >> The error seems to be due to line endings in file. Existing file contains >> windows line endings while patch has unix line endings. >> >> It is applying cleanly with --ignore-whitespace option. >> >> git am --ignore-whitespace [patchfile] >> >> >> - Anshul >> >> On November 19th, 2014, 5:17 a.m. UTC, Anshul Gangwar wrote: >> Review request for cloudstack, daan Hoogland and Rajesh Battala. >> By Anshul Gangwar. >> >> *Updated Nov. 19, 2014, 5:17 a.m.* >> *Bugs: * CLOUDSTACK-7752 >> <https://issues.apache.org/jira/browse/CLOUDSTACK-7752> >> *Repository: * cloudstack-git >> Description >> >> Fixed deployment planner stuck in infinite loop. If we create VM with shared >> service offering and attach disk with local disk offering, and one of >> storage pool is full(cannot be allocated) and other is not full then we are >> not putting the cluster in avoid list which is causing this infinite loop. >> >> Fixed by putting the cluster in avoid list even if one of the storage pool >> is full(cannot be allocated) >> >> Diffs >> >> - server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java >> (d9e1ecc2291a72a04ee0c1b35a079d5ff166bf77) >> >> View Diff <https://reviews.apache.org/r/28213/diff/> >> > > > > -- > Daan -- Daan
