[Pkg-ganeti-devel] [ganeti] 02/165: Merge branch 'stable-2.14' into master

[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 89e230ae4f02a8f447481005cece0ae7566d3661
Merge: 4c1128a 3330e4d
Author: Klaus Aehlig <aehlig at google.com>
Date:   Tue Jan 20 11:57:30 2015 +0100

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      (no changes)
    
    * stable-2.13
      Add a test verifying --ignore-soft-errors in hail
      Pass on options in nodeEvacInstance for ChangePrimary
      HTools: Pass --ignore-soft-errors all the way through
      Make tags a soft error
      Mention tags in --restricted-migration man page entry
      Ignore spurious pylint warnings
      Fix output in case of ExtStorage attach error
      Fix gnt-storage diagnose in case of missing files
      Revision bump to 2.13.0~beta1
      Prepare the NEWS file for 2.13.0~beta1
      Update the rst files for 2.13
      Add a note about downgrades wrt to SSH key handling
      Add check for >1 disk used with the LXC hypervisor
      Update years in copyright disclaimer for LXC files
      Use DSA SSH keys only
    
    * stable-2.12
      Revision bump to 2.12.1
      Prepare the NEWS file for the new 2.12.1 release
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Petr Pudlak <pudlak at google.com>

 Makefile.am                                  |   2 +
 NEWS                                         |  45 ++++-
 UPGRADE                                      |   7 +
 doc/design-2.13.rst                          |  14 ++
 doc/design-draft.rst                         |   4 +-
 doc/index.rst                                |   3 +
 lib/backend.py                               |  42 ++---
 lib/client/gnt_cluster.py                    |  28 ++-
 lib/client/gnt_node.py                       |  27 +--
 lib/hypervisor/hv_lxc.py                     |  20 +-
 lib/ssh.py                                   |  49 ++---
 lib/storage/extstorage.py                    |   7 +-
 man/hbal.rst                                 |   3 +-
 test/data/htools/hail-alloc-plain-tags.json  | 271 +++++++++++++++++++++++++++
 test/hs/shelltests/htools-hail.test          |   9 +
 test/py/ganeti.backend_unittest.py           |   5 +-
 test/py/ganeti.hypervisor.hv_lxc_unittest.py |   2 +-
 17 files changed, 437 insertions(+), 101 deletions(-)


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