Since a lot of devs are basing their features that have not yet been placed in Git off of master (which is now 4.5), we need to make sure it is clear not to rebase yourself beyond 48f8a95b06b0348ba1349cb5434183c2c18710db or 4.5 code that should not be in 4.4 could be brought into 4.4.
On Fri, Mar 14, 2014 at 9:04 AM, Hugo Trippaers <h...@trippaers.nl> wrote: > I announced the time when i would cut the branch in advance, so it > shouldn't be a surprise. > > But like i replied to Muralli, if you have a pending merge request on the > ML i see no problem with merging it in in the next few hours because of the > trouble with master. Just make sure it hits both master and the 4.4 branch. > I'll even happily do it for you if you point me to the branch that needs to > be merged into 4.4. Just make sure its rebased up to commit id > 48f8a95b06b0348ba1349cb5434183c2c18710db and not further. > > Cheers, > > Hugo > > On 14 mrt. 2014, at 15:56, Abhinandan Prateek < > abhinandan.prat...@citrix.com> wrote: > > > Yes, I think we could have checked with people struggling to fix the > > master and commit there features. > > -1 for the timing to cut the branch ! > > > > On 14/03/14 8:19 pm, "Murali Reddy" <murali.re...@citrix.com> wrote: > > > >> On 14/03/14 7:09 PM, "h...@apache.org" <h...@apache.org> wrote: > >> > >>> Repository: cloudstack > >>> Updated Branches: > >>> refs/heads/4.4 [created] 3ee1fc28d > >>> > >> > >> Hugo, > >> > >> I was holding off merge to master, as it seems to be broken now. I see > >> that you already created 4.4 branch. Can we wait till master is ready to > >> be checked-in and then cut a branch? > >> > >> Thanks, > >> Murali > >> > > > > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud<http://solidfire.com/solution/overview/?video=play> *(tm)*
