• Michele Tartara's avatar
    Merge branch 'origin/stable-2.8' into stable-2.9 · 85530402
    Michele Tartara authored
    * 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: default avatarMichele Tartara <mtartara@google.com>
    Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
    85530402
qa_config.py 19.6 KB