On Thu, May 2, 2013 at 4:45 PM, Michele Tartara <[email protected]> wrote: > commit f0a387d8487c2e76014237c750d6cd51090cecdf > Merge: 516a0e9 fc2318f > Author: Michele Tartara <[email protected]> > Date: Thu May 2 14:43:37 2013 +0000 > > Merge remote-tracking branch 'origin/stable-2.7' into stable-2.8 > > Conflicts: > INSTALL > NEWS > configure.ac > src/Ganeti/Query/Group.hs > test/hs/Test/Ganeti/Objects.hs > test/hs/Test/Ganeti/Query/Query.hs > > diff --cc INSTALL > index 5f72d1b,6c5f678..8325418 > --- a/INSTALL > +++ b/INSTALL
I'm a bit puzzled about the INSTALL changes. Can we double check them on a monitor? Rest LGTM Thanks, Guido
