You're right, I'll wait for the two patches. On Mon, Mar 2, 2015 at 6:52 PM, Klaus Aehlig <[email protected]> wrote:
> On Mon, Mar 02, 2015 at 06:01:39PM +0100, 'Petr Pudlak' via ganeti-devel > wrote: > > commit 68ce56cde915253c86212b241e22a72bc404f01a > > Merge: a16abe1 0a446fc > > Author: Petr Pudlak <[email protected]> > > Date: Mon Mar 2 18:00:06 2015 +0100 > > > > Merge branch 'stable-2.10' into stable-2.11 > > > > * stable-2.10 > > 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") > > Technically the merge is correct. But it might make more sense to > also include the two 2.10 patches currently under review. But if > you want to finish the merge now, go ahead, 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 >
