[Pkg-ganeti-devel] [ganeti] 41/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 0e6ffd7c1818e3512ebb0d1b609e4d3e17d4427f
Merge: 8e43e38 8e1fe3d
Author: Klaus Aehlig <aehlig at google.com>
Date:   Thu Feb 12 15:24:14 2015 +0100

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      Raise lens upper bound to <4.8, now that we support it
      Fix disk template queries
    
    * stable-2.13
      Make ganeti-mond honor /etc/services
      Document that hsqueeze was finished in 2.13
    
    * stable-2.12
      Construct lenses correctly for different 'lens' versions
      Create a simple CPP macro for detecting lens versions
      Allow LVM output parsing to work for thin volumes
      Retry on more network errors
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Also distribute devel/build_chroot
      Update ganeti download location
      Fix haddock comment
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Petr Pudlak <pudlak at google.com>

 Makefile.am                             |  1 +
 cabal/ganeti.template.cabal             |  2 +-
 doc/design-2.13.rst                     |  1 +
 doc/design-draft.rst                    |  1 -
 doc/index.rst                           |  1 +
 doc/install.rst                         |  2 +-
 lib/cmdlib/instance_query.py            | 12 +++++++-----
 lib/rpc/transport.py                    |  2 +-
 lib/storage/bdev.py                     | 22 +++++++++++++++-------
 src/Ganeti/HTools/CLI.hs                |  2 +-
 src/Ganeti/Lens.hs                      | 17 ++++++++++++++---
 src/Ganeti/Monitoring/Server.hs         |  8 ++++++--
 test/py/ganeti.storage.bdev_unittest.py |  2 ++
 13 files changed, 51 insertions(+), 22 deletions(-)


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