I mean as they are ordered in the log. The commits before and after the
merge are both working points.
commit 20d3cf1acc535c3380e52e92a4108444a0b593e3
Author: Alex Brett <alex.br...@citrix.com>
Date: Wed Oct 15 18:50:57 2014 +0100
CLOUDSTACK-7727 Skip various BVT tests on LXC
A number of BVT tests are not valid for LXC (e.g. migrating a VM), so
this patch
ensures they skip if LXC is in use.
Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org>
commit 148efbb73f0e084614eff62f48ea9fa964c64da8
Merge: 1f8cf0b 420d4e0
Author: Daan Hoogland <d...@onecht.net>
Date: Thu Oct 16 12:29:37 2014 +0200
Merge remote-tracking branch 'origin/4.5' into merge-master
commit 1f8cf0bee4f3fbe1c673dbc89c627f89d04da51f
Author: Sanjay Tripathi <sanjay.tripa...@citrix.com>
Date: Wed Oct 15 11:19:50 2014 +0530
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the
CloudStack UI.
On Thu, Oct 16, 2014 at 11:36 AM, Daan Hoogland <daan.hoogl...@gmail.com>
wrote:
> what do you mean by just after the merge?
>
> On Thu, Oct 16, 2014 at 7:28 PM, Marcus <shadow...@gmail.com> wrote:
>
> > The commit just before and just after the merge seem to work. They're
> both
> > from the 15th.
> >
> >
> > On Thu, Oct 16, 2014 at 11:12 AM, Nguyen Anh Tu <ng.t...@gmail.com>
> wrote:
> >
> > > I've just tried the commit before HEAD. It worked!
> > >
> > > --Tuna
> > >
> > > On Fri, Oct 17, 2014 at 12:10 AM, Daan Hoogland <
> daan.hoogl...@gmail.com
> > >
> > > wrote:
> > >
> > > > Marcus did you try the commit just before the merge? given the
> location
> > > of
> > > > the problem it might well be in the vpc refactor work or a
> combination
> > of
> > > > the both.
> > > >
> > > > I am trying myself as well now
> > > >
> > > >
> > > > On Thu, Oct 16, 2014 at 7:07 PM, Marcus <shadow...@gmail.com> wrote:
> > > >
> > > > > I can't rule out that it's specific to me at the moment, but I
> > cleaned
> > > my
> > > > > repo and rebuilt with the same failure, then went back to the
> commit
> > > just
> > > > > before this and it succeeded.
> > > > >
> > > > > Wouldn't it have to be pushed first to pass any CI testing? So in
> > > theory
> > > > we
> > > > > should never have CI catch compile errors if we don't push code
> that
> > > > won't
> > > > > compile.
> > > > >
> > > > > On Thu, Oct 16, 2014 at 11:03 AM, Daan Hoogland <
> > > daan.hoogl...@gmail.com
> > > > >
> > > > > wrote:
> > > > >
> > > > > > On Thu, Oct 16, 2014 at 6:57 PM, Marcus <shadow...@gmail.com>
> > wrote:
> > > > > >
> > > > > > > We probably shouldn't be
> > > > > > > pushing code into the repo that we haven't tried to compile.
> > > > > > >
> > > > > >
> > > > > > as I understand it it passed travis, I agree otherwise
> > > > > >
> > > > > >
> > > > > >
> > > > > > --
> > > > > > Daan
> > > > > >
> > > > >
> > > >
> > > >
> > > >
> > > > --
> > > > Daan
> > > >
> > >
> >
>
>
>
> --
> Daan
>
