[Pkg-ganeti-devel] [ganeti] 118/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 9492dacf31898edbb2f0d7236cefd69ebc7d15f4
Merge: d409cfc e07b96c
Author: Klaus Aehlig <aehlig at google.com>
Date:   Mon Apr 27 12:16:50 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Add self to top-level functions that were moved to a class
      Remove whitespace in empty line
      Improve tests for adding and modifying disks
      Group all the disk modification checks together
      Group disk provider checks with other mod checks
      Refactor disk_provider checks into helper function
    
    * stable-2.13
      Fix sample 2.12 configuration
      NodeSshRemoveKey: Add retries for updating the target node
      SSH file manager: properly name assertion function
      Unittests: Simplify generating a master candidate node
      RemoveNodeSshKey: use retries when updating other nodes
      AddNodeSshKey: retries for all non-master nodes
      AddNodeSshKey: retry when target node not reachable
      Remove obsolete constant SSHS_RENAME
      Simplify testdata setup and teardown
      Consider offline nodes when removing SSH keys
      Consider offline nodes in NodeSshKeyAdd
      Use SSH file manager for unittests removing keys
      Use SSH file manager in key adding unit tests
      Introduce (testutils) SSH file manager
      Only delete old node keys in one-key-setup
      Add debug comments to RenewCrypto
      Fix renewing master node's SSH key
      Create CHROOT directory before copy COMP_FILENAME
      Add missing design document to Makefile.am
    
    * stable-2.12
      When assigning UUIDs to disks, do so recursively
      Fix sample 2.11 configuration
      Include hypervisor parameters in SSConf
      Add SSConf keys for hypervisor parameters
      Use Hypervisor as the key in ClusterHvParams
      Re-remove final config update in renew-crypto
      Fix string formatting in private object representation
      Fix the computation of the list of reserved IP addresses
      Increase number of retries for daemon RPCs
    
    * stable-2.11
      Update configure file to version 2.11.7
      Update NEWS file for 2.11.7 release
      Add logging to RenewCrypto
      Fix format string for gnt-network info
      Replace textwrapper.wrap by a custom version for networks
      Add SSL improvements to NEWS file
    
    * stable-2.10
      Update tag limitations
      Fix typos in doc/design-storagetypes.rst
      Make getFQDN prefer cluster protocol family
      Add version of getFQDN accepting preferences
      Make getFQDN honor vcluster
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 Makefile.am                         |   1 +
 NEWS                                |  11 +
 devel/build_chroot                  |   1 +
 doc/admin.rst                       |   2 +-
 doc/design-storagetypes.rst         |   4 +-
 lib/backend.py                      | 250 +++++++---
 lib/client/gnt_network.py           |   6 +-
 lib/cmdlib/common.py                |   8 +
 lib/cmdlib/instance_set_params.py   |  60 +--
 lib/cmdlib/instance_storage.py      |  42 +-
 lib/cmdlib/node.py                  |  15 +-
 lib/rpc/transport.py                |   7 +-
 lib/serializer.py                   |   6 +-
 lib/tools/cfgupgrade.py             |  11 +-
 src/Ganeti/Config.hs                |   2 +-
 src/Ganeti/Constants.hs             |   8 +-
 src/Ganeti/Daemon.hs                |  24 +-
 src/Ganeti/Objects.hs               |   2 +-
 src/Ganeti/Query/Common.hs          |   2 +-
 src/Ganeti/Query/Instance.hs        |   2 +-
 src/Ganeti/Query/Network.hs         |  26 +-
 src/Ganeti/Ssconf.hs                |  81 ++--
 src/Ganeti/WConfd/ConfigVerify.hs   |   5 +-
 src/Ganeti/WConfd/Ssconf.hs         |  35 +-
 test/data/cluster_config_2.11.json  |   6 +-
 test/data/cluster_config_2.12.json  |   6 +-
 test/hs/Test/Ganeti/Objects.hs      |   4 +
 test/py/cmdlib/instance_unittest.py |  76 ++-
 test/py/ganeti.backend_unittest.py  | 891 +++++++++++++++++++++++++-----------
 test/py/testutils/config_mock.py    |   6 +
 test/py/testutils_ssh.py            | 514 +++++++++++++++++++++
 31 files changed, 1626 insertions(+), 488 deletions(-)


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