[Pkg-ganeti-devel] [ganeti] 135/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 080ebc70703232713fdde32aec90f2ad26f812ef
Merge: f1218ca 4964420
Author: Klaus Aehlig <aehlig at google.com>
Date:   Wed Jun 17 16:17:31 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Make htools tolerate missing "dtotal" and "dfree" on luxi
    
    Signed-off-by: Klaus Aehlig <aehlig at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 src/Ganeti/HTools/Backend/Luxi.hs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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