On Tue, Mar 24, 2015 at 04:28:37PM +0100, 'Petr Pudlak' via ganeti-devel wrote: > I forgot the Cherry-picked-from line. The full description will be: > > Upgrade codebase to support monad-control >=0.3.1.3 && <1.1 > > The interfaces for MonadTransControl, and MonadBaseControl has changed > since 1.0.0.0 in monad-control. > The associated types StT and StM are defined now using type instead of > newtype which simplifies definitions and method signatures. > With this patch monad-control 0.3.1.3 and later up til 1.1 are > supported. > > Signed-off-by: BSRK Aditya <[email protected]> > Signed-off-by: Petr Pudlak <[email protected]> > Reviewed-by: Petr Pudlak <[email protected]> > > Conflicts: > cabal/ganeti.template.cabal > src/Ganeti/BasicTypes.hs > src/Ganeti/Logging/WriterLog.hs > src/Ganeti/THH/HsRPC.hs > src/Ganeti/WConfd/Monad.hs > > Resolution: > - Remove the cabal template (present only in 2.14) > - Remove Haskell language extensions needed only in later versions > > Cherry-picked-from: 890b08b7fadce821e89c4c2c7aabe3c1ff47046e > Signed-off-by: Petr Pudlak <[email protected]>
LGTM -- 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
