« Previous | Next » 

Revision 551a29df

ID551a29dfe3b105ac264d74e173da0008cbbfa86b
Parent 29a30533, 112b6e89
Child 09b72783

Added by Iustin Pop over 8 years ago

Merge branch 'devel-2.6' into master

  • devel-2.6:
    Improve error message when migration status fail
    Fix type error in kvm/GetMigrationStatus
    Fix PID file writing in Haskell daemons

Conflicts (both trivial):
htools/Ganeti/Daemon.hs (_writePidFile rename)
lib/hypervisor/hv_kvm.py (master fixed an indentation issue)

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted