...solving a semantical conflict of the merge. Signed-off-by: Klaus Aehlig <[email protected]> --- src/Ganeti/DataCollectors/Types.hs | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/src/Ganeti/DataCollectors/Types.hs b/src/Ganeti/DataCollectors/Types.hs index 1157199..8b60be1 100644 --- a/src/Ganeti/DataCollectors/Types.hs +++ b/src/Ganeti/DataCollectors/Types.hs @@ -155,6 +155,7 @@ instance NFData ClockTime where instance NFData CollectorData where rnf (CPULoadData x) = rnf x + rnf (InstanceCpuLoad x) = rnf x #else @@ -168,6 +169,8 @@ form instance NFData CollectorData where rnf (CPULoadData x) = (x `using` seqFoldable rdeepseq) `seq` () + rnf (InstanceCpuLoad x) = (x `using` seqFoldable (seqFoldable rdeepseq)) + `seq` () #endif -- 2.2.0.rc0.207.ga3a616c
