LGTM, thanks On Fri, 24 Jul 2015 at 11:20 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit 2adb7f0a69e805934729e49246a7b8a9483f71a6 > Merge: 268953c e117a3b > Author: Klaus Aehlig <[email protected]> > Date: Fri Jul 24 11:17:09 2015 +0200 > > Merge branch 'stable-2.11' into stable-2.12 > > * stable-2.11 > (no changes) > > * stable-2.10 > Fix typo in secondary > When hinting to do gnt-instance info, show the instance > Update gnt-network example in admin page > > Conflicts: > lib/cmdlib/instance_storage.py: trivial > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc lib/cmdlib/instance_storage.py > index 9028e9b,610ee54..4aba6d3 > --- a/lib/cmdlib/instance_storage.py > +++ b/lib/cmdlib/instance_storage.py > @@@ -2265,9 -2136,9 +2265,9 @@@ class TLReplaceDisks(Tasklet) > (utils.CommaJoin(self.disks), self.instance.name)) > feedback_fn("Current primary node: %s" % > self.cfg.GetNodeName(self.instance.primary_node)) > + secondary_nodes = > self.cfg.GetInstanceSecondaryNodes(self.instance.uuid) > - feedback_fn("Current seconary node: %s" % > + feedback_fn("Current secondary node: %s" % > - utils.CommaJoin(self.cfg.GetNodeNames( > - self.instance.secondary_nodes))) > + utils.CommaJoin(self.cfg.GetNodeNames(secondary_nodes))) > > activate_disks = not self.instance.disks_active > > > > -- > 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 > -- Helga Velroyen 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 Diese E-Mail ist vertraulich. Wenn Sie nicht der richtige Adressat sind, leiten Sie diese bitte nicht weiter, informieren Sie den Absender und löschen Sie die E-Mail und alle Anhänge. Vielen Dank. This e-mail is confidential. If you are not the right addressee please do not forward it, please inform the sender, and please erase this e-mail including any attachments. Thanks.
