mirror of https://github.com/apache/cloudstack.git
Conflicts: engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java |
||
|---|---|---|
| .. | ||
| cache | ||
| datamotion | ||
| image | ||
| integration-test | ||
| resources/META-INF/cloudstack | ||
| snapshot | ||
| src/org/apache/cloudstack/storage | ||
| test/org/apache/cloudstack/engine/subsystem/api/storage | ||
| volume | ||
| pom.xml | ||
| storage.ucls | ||