LGTM
On Wed, Apr 9, 2014 at 9:06 PM, Klaus Aehlig <[email protected]> wrote: > ...so that it can be used by WConfD who needs to be > able to persist all its data. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > src/Ganeti/Locking/Waiting.hs | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/src/Ganeti/Locking/Waiting.hs b/src/Ganeti/Locking/Waiting.hs > index 24a4726..464be16 100644 > --- a/src/Ganeti/Locking/Waiting.hs > +++ b/src/Ganeti/Locking/Waiting.hs > @@ -38,9 +38,11 @@ module Ganeti.Locking.Waiting > ) where > > import Control.Arrow ((&&&)) > +import Control.Monad (liftM) > import qualified Data.Map as M > import Data.Maybe (fromMaybe) > import qualified Data.Set as S > +import qualified Text.JSON as J > > import Ganeti.BasicTypes > import qualified Ganeti.Locking.Allocation as L > @@ -246,3 +248,8 @@ fromExtRepr (alloc, pending) = > fst $ updateLocksWaiting prio owner req s) > (emptyWaiting { lwAllocation = alloc }) > pending > + > +instance (Lock a, J.JSON a, Ord b, J.JSON b, Show b, Ord c, J.JSON c) > + => J.JSON (LockWaiting a b c) where > + showJSON = J.showJSON . extRepr > + readJSON = liftM fromExtRepr . J.readJSON > -- > 1.9.1.423.g4596e3a > >
