mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
(cherry picked from commit e23b10319f55fe8cbb822c0c29dc64b56509c119)
Conflicts:
plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
server/src/com/cloud/storage/upload/UploadMonitorImpl.java