On Tue, Mar 03, 2015 at 10:36:53AM +0100, 'Petr Pudlak' via ganeti-devel wrote: > commit 0ab08f080b54a7d888b9c24594ea26f61bb3aad4 > Merge: a16abe1 cdb0a45 > Author: Petr Pudlak <[email protected]> > Date: Tue Mar 3 09:23:21 2015 +0100 > > Merge branch 'stable-2.10' into stable-2.11 > > * 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: > lib/backend.py - stop both daemons (Mond and KVMd) > > diff --cc lib/backend.py > index bf18784,d4c6b49..ef386d2 > --- a/lib/backend.py > +++ b/lib/backend.py > @@@ -566,7 -576,7 +566,8 @@@ def LeaveCluster(modify_ssh_setup) > logging.exception("Error while removing cluster secrets") > > utils.StopDaemon(constants.CONFD) > + utils.StopDaemon(constants.MOND) > + utils.StopDaemon(constants.KVMD) > > # Raise a custom exception (handled in ganeti-noded) > raise errors.QuitGanetiException(True, "Shutdown scheduled")
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
