Didn't you want another reviewer? On Mon, Aug 3, 2015 at 3:46 PM, Klaus Aehlig <[email protected]> wrote:
> On Mon, Aug 03, 2015 at 03:34:28PM +0200, 'Lisa Velden' via ganeti-devel > wrote: > > commit 7e0a74a59daa0171eb648f7ef1020e863506432d > > Merge: bab1c63 c7a2958 > > Author: Lisa Velden <[email protected]> > > Date: Mon Aug 3 13:45:42 2015 +0200 > > > > Merge branch 'stable-2.12' into stable-2.13 > > > > * stable-2.12 > > Correct indendation > > In confd provide proper serial number > > > > * stable-2.11 > > (no changes) > > > > * stable-2.10 > > Add a new unit test for LUInstanceMultiAlloc > > Fix a bug in LUInstanceMultiAlloc LU > > > > Conflicts: > > lib/bootstrap.py > > > > Resolution: > > lib/bootstrap.py: take indendation from stable-2.12 > > > > Semantical conflicts: > > src/Ganeti/Confd/Server.hs: add serial number to new queries > > 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 > -- Lisa Velden Software Engineer [email protected] Google Germany GmbH Dienerstraße 12 80331 München Geschäftsführer: Graham Law, Christine Elizabeth Flores Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg
