Then perhaps it should be sent as a different patch rather than as part of the merge.
Thanks, Guidi On 2 May 2013 18:10, "Michele Tartara" <[email protected]> wrote: > > > > On Thu, May 2, 2013 at 5:44 PM, Guido Trotter <[email protected]>wrote: > >> 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 > > > I guess what is puzzling you is the changes I did w.r.t. the curl library > for Haskell. > If I remember correctly, it was made mandatory in 2.8, and it was already > listed as such in the list of libraries. But the commands for installing > it, where still in the optional section. > While merging I realized this, and I fixed the issue. > > But if there is something else that doesn't convince you, we can check it > live on a monitor. > > >> >> > Rest LGTM >> >> Thanks, >> Guido >> > > Thanks, > Michele >
