cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [49/50] [abbrv] git commit: refs/heads/cisco-vnmc-api-integration - Fixed build issue from master merge
Date Thu, 21 Mar 2013 05:22:36 GMT
Fixed build issue from master merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9e9c1792
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9e9c1792
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9e9c1792

Branch: refs/heads/cisco-vnmc-api-integration
Commit: 9e9c179212e8c0896972c1f19a3327f97832697e
Parents: f0c1af2
Author: Koushik Das <koushik.das@citrix.com>
Authored: Thu Mar 21 00:25:10 2013 +0530
Committer: Koushik Das <koushik.das@citrix.com>
Committed: Thu Mar 21 00:25:10 2013 +0530

----------------------------------------------------------------------
 .../hypervisor/vmware/resource/VmwareResource.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9e9c1792/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index d53fe64..98847c1 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1570,7 +1570,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
                     vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, true);
         } else {
             networkInfo = HypervisorHostHelper.prepareNetwork(this._publicTrafficInfo.getVirtualSwitchName(),
"cloud.public",
-                    vmMo.getRunningHost(), vlanId, false, null, null, this._ops_timeout,
vSwitchType, _portsPerDvPortGroup);
+                    vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, vSwitchType,
_portsPerDvPortGroup, false);
         }
 
         int nicIndex = allocPublicNicIndex(vmMo);


Mime
View raw message