mirror of https://github.com/apache/cloudstack.git
Conflicts: plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java server/src/com/cloud/template/TemplateManagerImpl.java |
||
|---|---|---|
| .. | ||
| default | ||
| s3 | ||
| sample | ||
| swift | ||