[Pkg-ganeti-devel] [ganeti] 97/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 961f05eefb21cf9928e592440bddfb1abc26a711
Merge: 031d0e8 f7ca3ca
Author: Klaus Aehlig <aehlig at google.com>
Date:   Thu Apr 9 14:02:58 2015 +0200

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      Warn if WriteConfigAndUnlock returns False
      Make writeConfigAndUnlock retryable
    
    * stable-2.13
      Replace additional os.minor by our custom version
    
    * stable-2.12
      Fix typos
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      fix typos in design-file-based-storage.rst doc
      Switch to our osminor
      Provide an alternative for os.minor working around its bug
      Fix typo
      CanTieredAlloc test: make instances big enough
      After master-failover verify reachability of master IP
      Report failure to deactivate old master IP in exit code
      Expose warnings during master-failover
      Fix manpage for gnt-cluster copyfile
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 doc/design-daemons.rst                | 10 +++----
 doc/design-file-based-storage.rst     |  4 +--
 lib/bootstrap.py                      | 52 +++++++++++++++++++++++++----------
 lib/client/gnt_cluster.py             |  5 +++-
 lib/config/__init__.py                |  8 ++++--
 lib/storage/bdev.py                   |  4 +--
 lib/storage/extstorage.py             |  2 +-
 lib/utils/storage.py                  | 10 +++++++
 man/gnt-cluster.rst                   |  2 +-
 src/Ganeti/WConfd/Core.hs             | 20 ++++++++++----
 test/hs/Test/Ganeti/HTools/Cluster.hs |  2 +-
 11 files changed, 84 insertions(+), 35 deletions(-)

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