« Previous | Next » 

Revision 46c1f828

ID46c1f828e15e3f85115939704a5cc21d74e09809
Parent 2826897c, 16c2024a
Child 471b6c46

Added by Guido Trotter over 8 years ago

Merge branch 'devel-2.6'

  • devel-2.6:
    Disable E1101 on ganeti/http/server.py:424
    Fix live migration under xl
    Don't check for xend port when using xl

Conflicts:
lib/hypervisor/hv_xen.py: trivial

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted