[Pkg-ganeti-devel] [ganeti] 157/165: Merge branch 'stable-2.14' into stable-2.15

[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 807d3e03a084436a53081114805a9cda4864d097
Merge: e2bac8e f21bdec
Author: Klaus Aehlig <aehlig at google.com>
Date:   Mon Jul 27 11:07:36 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Revert 2.12-specific downgrade action on 2.14
    
    * stable-2.13
      Add ``--no-ssh-key-check`` to manpage of renew-crypto
      Redistribute master key on downgrade
      Use ssconf port map when handling SSH keys
      Make node_daemon_setup use common functions
      Add docstring to certificate verification
    
    * 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: Petr Pudlak <pudlak 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/backend.py                                     |  23 ++--
 lib/cmdlib/cluster/__init__.py                     |   3 +-
 lib/cmdlib/instance_storage.py                     |   6 +-
 lib/cmdlib/node.py                                 |  14 +--
 lib/rpc_defs.py                                    |   3 -
 lib/server/noded.py                                |  13 +-
 lib/ssh.py                                         |  22 ----
 lib/tools/common.py                                |   9 +-
 lib/tools/node_daemon_setup.py                     | 100 +--------------
 lib/tools/prepare_node_join.py                     |   2 +-
 lib/tools/ssh_update.py                            |   2 +-
 lib/tools/ssl_update.py                            |   2 +-
 man/gnt-cluster.rst                                |   7 +-
 man/gnt-instance.rst                               |   7 ++
 test/py/ganeti.backend_unittest.py                 |  46 +++----
 test/py/ganeti.tools.common_unittest.py            |  85 ++++++++++++-
 test/py/ganeti.tools.node_daemon_setup_unittest.py | 138 ---------------------
 23 files changed, 162 insertions(+), 336 deletions(-)


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