Merge branch 'devel-2.6' into submit
* 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:Iustin Pop <iustin@google.com> Reviewed-by:
Guido Trotter <ultrotter@google.com>
Showing
- Makefile.am 1 addition, 1 deletionMakefile.am
- htest/Test/Ganeti/HTools/Cluster.hs 2 additions, 1 deletionhtest/Test/Ganeti/HTools/Cluster.hs
- htools/Ganeti/Confd/Server.hs 4 additions, 3 deletionshtools/Ganeti/Confd/Server.hs
- htools/Ganeti/Daemon.hs 5 additions, 4 deletionshtools/Ganeti/Daemon.hs
- htools/Ganeti/HTools/Backend/Rapi.hs 2 additions, 3 deletionshtools/Ganeti/HTools/Backend/Rapi.hs
- htools/Ganeti/HTools/ExtLoader.hs 0 additions, 1 deletionhtools/Ganeti/HTools/ExtLoader.hs
- htools/Ganeti/Ssconf.hs 2 additions, 2 deletionshtools/Ganeti/Ssconf.hs
- htools/htools.hs 0 additions, 1 deletionhtools/htools.hs
- lib/hypervisor/hv_xen.py 2 additions, 2 deletionslib/hypervisor/hv_xen.py
- lib/pathutils.py 1 addition, 1 deletionlib/pathutils.py
- tools/xen-console-wrapper 3 additions, 2 deletionstools/xen-console-wrapper
Loading
Please register or sign in to comment