:) github should tell me, shouldn't it? On Tue, Oct 14, 2014 at 2:50 PM, wilderrodrigues <g...@git.apache.org> wrote:
> Github user wilderrodrigues commented on the pull request: > > https://github.com/apache/cloudstack/pull/22#issuecomment-59037299 > > Just a quick note: before pushing the rebase I will run the tests with > Simulator + Xen Server on both Basic and Advanced network, so I know for > sure everything is working. > > Once I’m done and the conflicts’ resolution is pushed, I will let you > know. > > Cheers, > Wilder > > From: Daan Hoogland <notificati...@github.com<mailto: > notificati...@github.com>> > Reply-To: apache/cloudstack <re...@reply.github.com<mailto: > re...@reply.github.com>> > Date: Tuesday 14 October 2014 14:39 > To: apache/cloudstack <cloudst...@noreply.github.com<mailto: > cloudst...@noreply.github.com>> > Cc: Wilder Rodrigues <wrodrig...@schubergphilis.com<mailto: > wrodrig...@schubergphilis.com>> > Subject: Re: [cloudstack] Vpc refactor clean for pr (#22) > > two small conflicts with present master. Can you decide on them, > Wilder? > > On Mon, Oct 13, 2014 at 1:49 PM, Wilder Rodrigues < > notificati...@github.com<mailto:notificati...@github.com>> > wrote: > > > That would be really appreciated, as we have work on 2 other branches > > waiting to get upstream as well. > > > > If you need more tests, please do not hesitate to let me know: always > > willing to help. > > > > Cheers, > > Wilder > > > > — > > Reply to this email directly or view it on GitHub > > <https://github.com/apache/cloudstack/pull/22#issuecomment-58881400 > >. > > > > > > -- > Daan > > — > Reply to this email directly or view it on GitHub< > https://github.com/apache/cloudstack/pull/22#issuecomment-59035961>. > > > --- > 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. > --- > -- Daan