OK , will re-do the merge and re-test and commit by EOD On 1/16/13 1:56 PM, "Animesh Chaturvedi" <animesh.chaturv...@citrix.com> wrote:
>Chiradeep > >Are you waiting on revert for 312? Murali reverted it today > >Thanks >Animesh > >> -----Original Message----- >> From: Chiradeep Vittal [mailto:chiradeep.vit...@citrix.com] >> Sent: Friday, January 11, 2013 1:08 PM >> To: CloudStack DeveloperList >> Subject: Re: [MERGE] network refactoring, phase 1 >> >> I'm going to wait on the reverts for CLOUDSTACK-306 and CLOUDSTACK-312 >> >> On 1/11/13 12:15 PM, "Alex Huang" <alex.hu...@citrix.com> wrote: >> >> >> +1 - with an assumption that Alex and others are OK with it (since >>the >> >> javelin branch merge was proposed first). >> > >> >+1 We're struggling with the merge right now so one more merge is not >> >going to hurt very much. >> > >> >--Alex >