On Tue, Mar 03, 2015 at 02:04:41PM +0100, 'Petr Pudlak' via ganeti-devel wrote: > commit 07c04d557a77fc1238ffee1702d5689d35fcaa7e > Merge: bb02b8f fda1a35 > Author: Petr Pudlak <[email protected]> > Date: Tue Mar 3 12:57:17 2015 +0100 > > Merge branch 'stable-2.11' into stable-2.12 > > * stable-2.11 > (no changes) > > * stable-2.10 > Relax expectation of accuracy > Improve rounding accuracty in updateStatistics > Update gnt-backup manual to reflect real behavior > Finalize local export only if successful > > * stable-2.9 > Stop MonD when removing a node from a cluster > > Conflicts: > man/gnt-backup.rst > src/Ganeti/Utils.hs > test/hs/Test/Ganeti/Utils.hs > > Resolution: Propagate changes in 2.10 (also to the files that have been > moved in 2.12).
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
