Merge branch 'vmware-datamodel' of
https://git-wip-us.apache.org/repos/asf/cloudstack into vmware-datamodel
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenter.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterVO.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMap.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterZoneMapVO.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDao.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterDaoImpl.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/dao/VmwareDatacenterZoneMapDao.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/AddVmwareDcCmd.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/api/command/admin/zone/RemoveVmwareDcCmd.java
plugins/hypervisors/vmware/src/org/apache/cloudstack/api/response/VmwareDatacenterResponse.java
plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/599b8269
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/599b8269
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/599b8269
Branch: refs/heads/vmware-datamodel
Commit: 599b826957c43452656a4fcf1b8472db3d231fc5
Parents: ce2c340 8996ea3
Author: Sateesh Chodapuneedi <[email protected]>
Authored: Thu May 23 07:18:54 2013 +0530
Committer: Sateesh Chodapuneedi <[email protected]>
Committed: Thu May 23 07:18:54 2013 +0530
----------------------------------------------------------------------
.../hypervisor/vmware/VmwareDatacenterService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/599b8269/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
----------------------------------------------------------------------
diff --cc
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
index fc77d65,f04b2b5..d1d0c9a
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareDatacenterService.java
@@@ -29,4 -12,4 +29,4 @@@ public interface VmwareDatacenterServic
public VmwareDatacenterVO addVmwareDatacenter(AddVmwareDcCmd cmd) throws
IllegalArgumentException, DiscoveryException, ResourceInUseException, Exception;
public boolean removeVmwareDatacenter(RemoveVmwareDcCmd cmd) throws
IllegalArgumentException, ResourceInUseException, Exception;
--}
++}
