LGTM
On Tue, May 6, 2014 at 4:07 PM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote: > > commit 0751cb84ae968c5a199a32a9926c47c4d76aa6a0 > Merge: a526575 aff0270 > Author: Klaus Aehlig <[email protected]> > Date: Tue May 6 16:04:04 2014 +0200 > > Merge branch 'stable-2.12' into master > > * stable-2.12 > Make upgrade more robust > Fix order in downgrades > Simplify cleanup of locks > Handle lock addition as lock acquisitions > > Conflicts: > tools/cfgupgrade: ignore downgrade instructions > from 2.12 > > Signed-off-by: Klaus Aehlig <[email protected]> > > > > -- > 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 >
