mirror of https://github.com/apache/cloudstack.git
Conflicts:
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
Signed-off-by: Jayapal <jayapal@apache.org>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| com/cloud | ||
| org/apache/cloudstack | ||