mirror of https://github.com/apache/cloudstack.git
merge createtemplateresponse and createteisoresponse on UI template only show template corresponding hypervisor exists Conflicts: api/src/com/cloud/api/ResponseGenerator.java server/src/com/cloud/storage/StorageManager.java |
||
|---|---|---|
| .. | ||
| src/com/cloud | ||
| .classpath | ||
| .project | ||