[Pkg-ganeti-devel] [ganeti] 151/165: Merge branch 'stable-2.11' into stable-2.12

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 1b116d8a0be466ad2aaad67bdc36fa0c5b682d54
Merge: 268953c e117a3b
Author: Klaus Aehlig <aehlig at google.com>
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 <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 doc/admin.rst                  | 2 +-
 lib/cmdlib/instance_storage.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git