2016-06-10 15:40 GMT+02:00 'Brian Foley' via ganeti-devel < [email protected]>:
> commit b462d8c77bff0789e8a951288dea34226ab8b6d7 > Merge: 20c24a8 90281b4 > Author: Brian Foley <[email protected]> > Date: Fri Jun 10 14:35:13 2016 +0100 > > Merge branch 'stable-2.16' into stable-2.17 > > * stable-2.16 > Fix optimisation: Correctly extract secondary node > Tune getNodeInstances DRBD secondary computation > Get haskell daemons to only compress files > 4kB > Use zlib compression level 3 in Haskell RPC code > > * stable-2.15 > Fixup compatibility with GHC 7.4/base 4.5 > > Manually resolve import conflicts. > > Signed-off-by: Brian Foley <[email protected]> > LGTM, although I can't check the merge, but the diffs look sane. diff --cc src/Ganeti/Codec.hs > index 9a41499,404c70b..6f54c0d > --- a/src/Ganeti/Codec.hs > +++ b/src/Ganeti/Codec.hs > @@@ -37,21 -37,18 +37,23 @@@ module Ganeti.Code > , decompressZlib > ) where > > +import Prelude () > +import Ganeti.Prelude > Oh, this is interesting, I was wondering if there is such a module, and it seems there is :) iustin
