[Pkg-ganeti-devel] [ganeti] 150/165: Merge branch 'stable-2.10' into stable-2.11

[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 e117a3bbf76d9adbd6b611240e1b81e3ab7eb071
Merge: 4b5a975 c2bc29c
Author: Klaus Aehlig <aehlig at google.com>
Date:   Thu Jul 23 19:22:39 2015 +0200

    Merge branch 'stable-2.10' into stable-2.11
    
    * stable-2.10
      Fix typo in secondary
      When hinting to do gnt-instance info, show the instance
      Update gnt-network example in admin page
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Hrvoje Ribicic <riba at google.com>

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


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