commit 0004802eadac35d1899436fc0305bff77b0e631b
Merge: 1573e03 d433da5
Author: Klaus Aehlig <[email protected]>
Date: Fri Feb 20 11:07:15 2015 +0100
Merge branch 'stable-2.14' into master
* stable-2.14
break line with 81 chars
Suffix bump for 2.14.0 beta1
Update NEWS for 2.14.0 beta1
Update documents for 2.14
Document NAL removal in NEWS
* stable-2.13
Fix upgrading of data_collectors entry in cluster
* stable-2.12
Increase waiting time for WConfD
* stable-2.11
(no changes)
* stable-2.10
Fix haddock comment
* stable-2.9
Fix file descriptor leak in Confd Client
Fix hlint warnings found by hlint 1.9.11
Semantical Conflict: Undo suffix bump on master
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc src/Ganeti/DataCollectors/Types.hs
index b37049c,e4db7b8..6beb042
--- a/src/Ganeti/DataCollectors/Types.hs
+++ b/src/Ganeti/DataCollectors/Types.hs
@@@ -138,10 -138,8 +138,10 @@@ instance JSON DCVersion wher
then Ok DCVerBuiltin else Ok . DCVersion $ fromJSString s
readJSON v = fail $ "Invalid JSON value " ++ show v ++ " for type DCVersion"
- -- | Type for the value field of the above map.
+ -- | Type for the value field of the `CollectorMap` below.
-data CollectorData = CPULoadData (Seq.Seq (ClockTime, [Int]))
+data CollectorData =
+ CPULoadData (Seq.Seq (ClockTime, [Int]))
+ | InstanceCpuLoad (Map.Map String (Seq.Seq (ClockTime, Double)))
-- | Type for the map storing the data of the statefull DataCollectors.
type CollectorMap = Map.Map String CollectorData
--
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
