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

Apollon Oikonomopoulos apoikos at moszumanska.debian.org
Tue Aug 11 13:53:17 UTC 2015


This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 031d0e83862171853b946db886fdbaee681fad09
Merge: a865657 a6961e0
Author: Klaus Aehlig <aehlig at google.com>
Date:   Thu Apr 2 13:34:19 2015 +0200

    Merge branch 'stable-2.14' into master
    
    * stable-2.14
      (no changes)
    
    * stable-2.13
      (no changes)
    
    * stable-2.12
      Add default values for hv_state_static and disk_state_static
      Add a value for the empty Container
      Verify if we're master before demoting
      Also consider connection time out a network error
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Fixed typos
      Pass correct params in move-instance
      In CanTieredAlloc test set IPolicy
      Make genInstanceMaybeBiggerThanNode honor policy lower bound
      Also export a null ISpec
      Support instance generation within ranges
      Add a function to leave the list monad
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 lib/cmdlib/node.py                     |  3 +++
 lib/rpc/transport.py                   |  3 ++-
 man/gnt-instance.rst                   |  4 ++--
 src/Ganeti/Objects.hs                  |  6 +++--
 test/hs/Test/Ganeti/HTools/Cluster.hs  |  4 +++-
 test/hs/Test/Ganeti/HTools/Instance.hs | 44 +++++++++++++++++++++++-----------
 test/hs/Test/Ganeti/TestHTools.hs      | 19 +++++++++------
 tools/move-instance                    |  2 +-
 8 files changed, 57 insertions(+), 28 deletions(-)

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



More information about the Pkg-ganeti-devel mailing list