[Pkg-ganeti-devel] [ganeti] 153/165: Merge branch 'stable-2.12' into stable-2.13

[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 bab1c6311ff41adf2925ae2f7027107d84e66bf2
Merge: 903c351 fecdec0
Author: Klaus Aehlig <aehlig at google.com>
Date:   Fri Jul 24 13:01:53 2015 +0200

    Merge branch 'stable-2.12' into stable-2.13
    
    * stable-2.12
      Also provide default arguments for mond
      Support sphinx 1.3
      Make documentation for -H serial_console more explicit
    
    * 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
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 Makefile.am                       | 7 ++++++-
 configure.ac                      | 3 +++
 doc/admin.rst                     | 2 +-
 doc/conf.py                       | 2 +-
 doc/examples/ganeti.default       | 1 +
 doc/examples/ganeti.default-debug | 1 +
 lib/cmdlib/instance_storage.py    | 6 +++---
 man/gnt-instance.rst              | 7 +++++++
 8 files changed, 23 insertions(+), 6 deletions(-)


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