mirror of https://github.com/apache/cloudstack.git
Fixing conflicts Conflicts: api/src/com/cloud/exception/CloudException.java api/src/com/cloud/storage/StorageService.java api/src/com/cloud/storage/Volume.java client/tomcatconf/commands.properties.in server/src/com/cloud/storage/StorageManagerImpl.java setup/db/create-schema-view.sql |
||
|---|---|---|
| .. | ||
| kvm | ||
| ovm | ||
| simulator | ||
| vmware | ||
| xen | ||