You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Daan Hoogland <da...@gmail.com> on 2014/04/15 22:57:21 UTC
Re: git commit: updated refs/heads/4.4 to 46f6b26
Anthony,
Can you remove instead of commenting out code? We do have git.
Op 15 apr. 2014 20:43 schreef <an...@apache.org>:
> Repository: cloudstack
> Updated Branches:
> refs/heads/4.4 b78aee8f1 -> 46f6b26d4
>
>
> disable XAPI event
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46f6b26d
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46f6b26d
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46f6b26d
>
> Branch: refs/heads/4.4
> Commit: 46f6b26d49c39d6ec1c98876799c04d8cd92b46e
> Parents: b78aee8
> Author: Anthony Xu <an...@citrix.com>
> Authored: Tue Apr 15 11:26:17 2014 -0700
> Committer: Anthony Xu <an...@citrix.com>
> Committed: Tue Apr 15 11:42:53 2014 -0700
>
> ----------------------------------------------------------------------
> .../hypervisor/xen/resource/XenServer620Resource.java | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46f6b26d/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
> ----------------------------------------------------------------------
> diff --git
> a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
> b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
> index 0c8bc71..4c9907b 100644
> ---
> a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
> +++
> b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer620Resource.java
> @@ -19,18 +19,20 @@ import com.xensource.xenapi.Connection;
> import com.xensource.xenapi.Host;
> import com.xensource.xenapi.HostPatch;
> import com.xensource.xenapi.PoolPatch;
> +/*
> +import java.util.HashSet;
> import com.xensource.xenapi.Event;
> import com.xensource.xenapi.Task;
> import com.xensource.xenapi.Types;
> import com.xensource.xenapi.Types.XenAPIException;
> import org.apache.xmlrpc.XmlRpcException;
> +import java.util.concurrent.TimeoutException;
> +*/
> import org.apache.cloudstack.hypervisor.xenserver.XenserverConfigs;
> import java.util.Map;
> import java.util.Set;
> -import java.util.HashSet;
> import javax.ejb.Local;
> import org.apache.log4j.Logger;
> -import java.util.concurrent.TimeoutException;
> import com.cloud.agent.api.StartupRoutingCommand;
> import com.cloud.resource.ServerResource;
>
> @@ -110,7 +112,7 @@ public class XenServer620Resource extends
> XenServer610Resource {
> cmd.setHostDetails(details);
> }
>
> -
> +/*
> protected void waitForTask(Connection c, Task task, long
> pollInterval, long timeout) throws XenAPIException, XmlRpcException,
> TimeoutException {
> long beginTime = System.currentTimeMillis();
> if (s_logger.isTraceEnabled()) {
> @@ -162,6 +164,6 @@ public class XenServer620Resource extends
> XenServer610Resource {
> }
> }
> }
> -
> +*/
>
> }
>
>