cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <daan.hoogl...@gmail.com>
Subject Re: master broken
Date Thu, 16 Oct 2014 21:43:50 GMT
On Thu, Oct 16, 2014 at 11:37 PM, Frank Zhang <Frank.Zhang@citrix.com>
wrote:

> Do you know what part of baremetal causes the issue?
>
No it is due to the merge back of the 4.5 branch


> I built master on Wed and didn't see any issue. I will give it a try right
> now.
>
​I probably resolved some conflict the wrong way. I cannot find
BaremetalProvisionDoneNotificationCmd in any of the commits. But this is
only one of problems I think.



>
> > -----Original Message-----
> > From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
> > Sent: Thursday, October 16, 2014 2:28 PM
> > To: dev; Frank Zhang
> > Subject: Re: master broken
> >
> > I can't seem to get it working by reverting, neither the merge commit nor
> > individual related commits.
> >
> > @Frank: can we disable baremetal all together until you are done?
> >
> > On Thu, Oct 16, 2014 at 9:43 PM, Daan Hoogland <daan.hoogland@gmail.com>
> > wrote:
> >
> > > I found some culprits, it is in partly reverted code that was
> > > committed before the cut of master and 4.5. All to do with Baremetal.
> > > I am having a look.
> > >
> > >
> > > On Thu, Oct 16, 2014 at 8:54 PM, Daan Hoogland
> > > <daan.hoogland@gmail.com>
> > > wrote:
> > >
> > >> On Thu, Oct 16, 2014 at 8:17 PM, Marcus <shadowsor@gmail.com> wrote:
> > >>
> > >>> I mean as they are ordered in the log. The commits before and after
> > >>> the merge are both working points.
> > >>>
> > >>
> > >> ​We are talking about a merge of master and 4.5, so I am now trying
> > >> 4.5 to see if the errors are in there as well. If they are I will fix
> > >> there and merge forward. If not I will revert and morn.​
> > >>
> > >>
> > >>
> > >> --
> > >> Daan
> > >>
> > >
> > >
> > >
> > > --
> > > Daan
> > >
> >
> >
> >
> > --
> > Daan
>



-- 
Daan

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message