From 1203063fefa27f042323886e5b62b04aeea470f0 Mon Sep 17 00:00:00 2001 From: anthony Date: Fri, 27 Jan 2012 09:58:58 -0800 Subject: [PATCH] bug 13086: remove host tag from VDI after rset_power a VM status 13086: resolved fixed Conflicts: core/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java --- .../cloud/hypervisor/xen/resource/XenServer600Resource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java index ea0c060a2e0..c26840497ea 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java +++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer600Resource.java @@ -21,14 +21,15 @@ import java.util.ArrayList; import java.util.List; import javax.ejb.Local; + import org.apache.log4j.Logger; import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; -@Local(value = ServerResource.class) -public class XenServer600Resource extends XenServer56Resource { +@Local(value=ServerResource.class) +public class XenServer600Resource extends XenServer56FP1Resource { private static final Logger s_logger = Logger.getLogger(XenServer600Resource.class); public XenServer600Resource() {