LGTM, thanks On Tue, Mar 17, 2015 at 2:44 PM, 'Petr Pudlak' via ganeti-devel < [email protected]> wrote:
> On Tue, Mar 17, 2015 at 01:50:05PM +0100, Klaus Aehlig wrote: > >> On Tue, Mar 17, 2015 at 12:56:59PM +0100, 'Petr Pudlak' via ganeti-devel >> wrote: >> >>> commit bc47bd760bd237dfa57f62be192243e5cbb036ab >>> Merge: c0bbbb0 5ebbd75 >>> Author: Petr Pudlak <[email protected]> >>> Date: Tue Mar 17 12:54:27 2015 +0100 >>> >>> Merge branch 'stable-2.12' into stable-2.13 >>> >>> Conflicts: >>> src/Ganeti/Query/Exec.hs >>> Resolution: merge changes from both branches >>> >>> Signed-off-by: Petr Pudlak <[email protected]> >>> >> >> Shouldn't the log message also mention the changes that are merged >> up? >> > > Sorry for that, of course. The whole message will be: > > Merge branch 'stable-2.12' into stable-2.13 > > * stable-2.12 > Fix the generation of Makefile.ghc rules for *_hi > Fix error handling for failed fork jobs > If a forked job process malfunctions, kill it thoroughly > Add function to run checked computations in `MonadError` > Add job ID and process ID to log statements in Exec.hs > > > Conflicts: > src/Ganeti/Query/Exec.hs > Resolution: merge changes from both branches > > Signed-off-by: Petr Pudlak <[email protected]> > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
