« Previous | Next » 

Revision 85530402

ID85530402b4d6cb9e5ef650ccfc4fb07f600bde74
Parent fa0192b2, 6177890b
Child 74a4fc94

Added by Michele Tartara over 6 years ago

Merge branch 'origin/stable-2.8' into stable-2.9

  • stable-2.8
    Improve RAPI detection of the watcher
    Add patching QA configuration files on buildbots
    Enable a timeout for instance shutdown
    Allow KVM commands to have a timeout
    Allow xen commands to have a timeout
    Fix wrong docstring

Conflicts:
lib/hypervisor/hv_xen.py
test/py/ganeti.hypervisor.hv_xen_unittest.py

Resolution:
The conflicts were due to a new mandatory parameter hvparams being added
(in 2.9) to the same functions that received the optional timeout parameter
(in 2.8). They were resolved by keeping the hvparams in its place, and
enqueuing the timeout parameter after it.

Signed-off-by: Michele Tartara <>
Reviewed-by: Klaus Aehlig <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted