Updated Branches: refs/heads/sdnextensions bcfb4e67c -> 2b8389584
fix white-space Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2b838958 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2b838958 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2b838958 Branch: refs/heads/sdnextensions Commit: 2b8389584963a76ee5d1f1e780d6f73a1a093a46 Parents: bcfb4e6 Author: tuna <[email protected]> Authored: Fri Jul 12 17:56:00 2013 +0700 Committer: Sebastien Goasguen <[email protected]> Committed: Fri Jul 12 08:56:00 2013 -0400 ---------------------------------------------------------------------- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 ++-- scripts/vm/hypervisor/xenserver/ovstunnel | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b838958/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index cda5711..30b0521 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -8605,7 +8605,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe @Override public void setRunLevel(int level) { } - + private boolean is_xcp() { Connection conn = getConnection(); String result = callHostPlugin(conn, "ovstunnel", "is_xcp"); @@ -8613,7 +8613,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe return true; return false; } - + private String getLabel() { Connection conn = getConnection(); String result = callHostPlugin(conn, "ovstunnel", "getLabel"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2b838958/scripts/vm/hypervisor/xenserver/ovstunnel ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/ovstunnel b/scripts/vm/hypervisor/xenserver/ovstunnel index 9a89630..a4760b2 100755 --- a/scripts/vm/hypervisor/xenserver/ovstunnel +++ b/scripts/vm/hypervisor/xenserver/ovstunnel @@ -268,7 +268,7 @@ def is_xcp(session, args): 'param-name=software-version', 'param-key=platform_name'] platform = lib.do_cmd(platform_cmd).split('.')[0] - return platform + return platform def getLabel(session, args): pif_list_cmd = [lib.XE_PATH, 'pif-list', '--minimal']
