[Pkg-ganeti-devel] [ganeti] 92/165: Add rnf definition for InstanceCpuLoad

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit dbfbb718dbab6f2845f3d09ae9aaf99fd5237b2a
Author: Klaus Aehlig <aehlig at google.com>
Date:   Wed Mar 25 18:26:01 2015 +0100

    Add rnf definition for InstanceCpuLoad
    
    ...solving a semantical conflict of the merge.
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Hrvoje Ribicic <riba at google.com>
---
 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
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git