LGTM, thanks On Tue, 31 Mar 2015 at 10:34 'Klaus Aehlig' via ganeti-devel < ganeti-devel@googlegroups.com> wrote:
> > commit 24275454cdd4560e1f48d65688a8f6497a326cae > Merge: 51e9eef a7f867a > Author: Klaus Aehlig <aeh...@google.com> > Date: Tue Mar 31 10:27:54 2015 +0200 > > Merge branch 'stable-2.10' into stable-2.11 > > * stable-2.10 > Fixed typos > Pass correct params in move-instance > In CanTieredAlloc test set IPolicy > Make genInstanceMaybeBiggerThanNode honor policy lower bound > Also export a null ISpec > Support instance generation within ranges > Add a function to leave the list monad > > Conflicts: > src/Ganeti/BasicTypes.hs (take all the imports) > > Signed-off-by: Klaus Aehlig <aeh...@google.com> > > diff --cc src/Ganeti/BasicTypes.hs > index 2d00f5f,aee67ad..570f166 > --- a/src/Ganeti/BasicTypes.hs > +++ b/src/Ganeti/BasicTypes.hs > @@@ -35,24 -35,15 +35,25 @@@ module Ganeti.BasicType > , genericResult > , Result > , ResultT(..) > + , mkResultT > + , withError > + , withErrorT > , resultT > - , FromString(..) > + , toErrorStr > + , Error(..) -- re-export from Control.Monad.Error > , isOk > , isBad > + , justOk > + , justBad > , eitherToResult > , annotateResult > + , annotateError > + , failError > + , catchErrorT > + , handleErrorT > , iterateOk > , select > + , runListHead > , LookupResult(..) > , MatchPriority(..) > , lookupName > > > -- > 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 >
