LGTM, thanks On Tue, Feb 17, 2015 at 6:44 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit 4be5c9e32aa5d5cc50b707026dd0e7ad552eea04 > Merge: 8b24ee6 bb02b8f > Author: Klaus Aehlig <[email protected]> > Date: Tue Feb 17 18:41:57 2015 +0100 > > Merge branch 'stable-2.12' into stable-2.13 > > * 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 > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc src/Ganeti/DataCollectors/Types.hs > index 869b331,55a8418..e4db7b8 > --- a/src/Ganeti/DataCollectors/Types.hs > +++ b/src/Ganeti/DataCollectors/Types.hs > @@@ -138,8 -135,8 +138,8 @@@ 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 (Integer, [Int])) > +data CollectorData = CPULoadData (Seq.Seq (ClockTime, [Int])) > > -- | 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 >
