You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/05/28 00:30:44 UTC
[25/50] git commit: CS-14937: System VMs and Router VMs does not come
up after upgrading from 3.0 to Bonita
CS-14937: System VMs and Router VMs does not come up after upgrading from 3.0 to Bonita
Description:
Reverting my earlier fix for bug 14937. The fix is
not needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b3e05a7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b3e05a7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b3e05a7d
Branch: refs/heads/master
Commit: b3e05a7dcbf3e26b991d41235ad895c358e030f8
Parents: f7797e8
Author: Vijayendra Bhamidipati <vi...@citrix.com>
Authored: Thu May 17 19:14:54 2012 -0700
Committer: Vijayendra Bhamidipati <vi...@citrix.com>
Committed: Fri May 25 18:10:35 2012 -0700
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b3e05a7d/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 55bc0c1..e47aee3 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1481,7 +1481,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.info("Prepare NIC device based on NicTO: " + _gson.toJson(nicTo));
Pair<ManagedObjectReference, String> networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo);
- if (_nexusVSwitch) {
+ if (mgr.getNexusVSwitchGlobalParameter()) {
String dvSwitchUuid;
ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter();
DatacenterMO dataCenterMo = new DatacenterMO(context, dcMor);