commit 913d118f10a1f7be7409b42defac56e5ecb6fc74
Merge: aa112e9 8f467ab
Author: Klaus Aehlig <[email protected]>
Date: Tue May 20 16:19:11 2014 +0200
Merge branch 'stable-2.9' into stable-2.10
* stable-2.9
Improve haskell style
check-man-warnings: use C.UTF-8 and set LC_ALL
Fix passing of ispecs in cluster init during QA
Conflicts:
src/Ganeti/Monitoring/Server.hs: trivial
diff --cc src/Ganeti/Monitoring/Server.hs
index 59968d2,1959f3d..ded1e6d
--- a/src/Ganeti/Monitoring/Server.hs
+++ b/src/Ganeti/Monitoring/Server.hs
@@@ -207,11 -173,11 +207,11 @@@ error404 = d
modifyResponse $ setResponseStatus 404 "Not found"
writeBS "Resource not found"
--- | Return the report of one collector
-oneReport :: Snap ()
-oneReport = do
+-- | Return the report of one collector.
+oneReport :: MVar CollectorMap -> Snap ()
+oneReport mvar = do
- categoryName <- fmap (maybe mzero unpack) $ getParam "category"
- collectorName <- fmap (maybe mzero unpack) $ getParam "collector"
+ categoryName <- maybe mzero unpack <$> getParam "category"
+ collectorName <- maybe mzero unpack <$> getParam "collector"
category <-
case catFromName categoryName of
BT.Ok cat -> return cat
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
