commit 7eb49311e18865db76c4e8da5eb4b2e166db2d55
Merge: a32eb3c 17a1c27
Author: Brian Foley <[email protected]>
Date: Fri Jun 10 15:20:33 2016 +0100
Merge branch 'stable-2.17'
* stable-2.17
<nothing>
* 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
Signed-off-by: Brian Foley <[email protected]>
diff --cc src/Ganeti/Codec.hs
index a703ba8,6f54c0d..b3b4c87
--- a/src/Ganeti/Codec.hs
+++ b/src/Ganeti/Codec.hs
@@@ -42,12 -40,12 +42,12 @@@ module Ganeti.Code
import Prelude ()
import Ganeti.Prelude
- import Codec.Compression.Zlib (compress)
+ import Codec.Compression.Zlib
import qualified Codec.Compression.Zlib.Internal as I
import Control.Monad (liftM)
-import Control.Monad.Error.Class (MonadError(..))
import qualified Data.ByteString.Lazy as BL
import qualified Data.ByteString.Lazy.Internal as BL
+import Control.Monad.Error.Class (MonadError(..))
import Ganeti.BasicTypes
