• Iustin Pop's avatar
    Merge branch 'devel-2.6' into submit · b9612abb
    Iustin Pop authored
    
    
    * devel-2.6:
      Fix compatibility with newer Haskell libraries
      Fix gnt-instance console with xl
    
    Conflicts:
            Makefile.am (reordering, fixed)
            htools/Ganeti/Confd/Server.hs (hlint fixes on master)
            htools/Ganeti/Daemon.hs (hlint)
            htools/Ganeti/HTools/Backend/Rapi.hs (hlint)
            htools/Ganeti/HTools/ExtLoader.hs (hlint)
            htools/Ganeti/HTools/QC.hs (file renamed/split in master, fixed)
            htools/test.hs (we don't use maxDiscards, ignored)
            lib/constants.py (move to pathutils)
            lib/hypervisor/hv_xen.py (move to pathutils)
    Signed-off-by: default avatarIustin Pop <iustin@google.com>
    Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
    b9612abb
Makefile.am 48.9 KB