Commit ddc64582 authored by Michele Tartara's avatar Michele Tartara
Browse files

Fix error introduced during merge

A parameter was lost while resolving a conflict in the signature of a function.
Signed-off-by: default avatarMichele Tartara <>
Reviewed-by: default avatarKlaus Aehlig <>
parent 74a4fc94
......@@ -626,7 +626,7 @@ class XenHypervisor(hv_base.BaseHypervisor):
return self._StopInstance(name, force, instance.hvparams, timeout)
def _ShutdownInstance(self, name, hvparams):
def _ShutdownInstance(self, name, hvparams, timeout):
"""Shutdown an instance if the instance is running.
The '-w' flag waits for shutdown to complete which avoids the need
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment