mirror of https://github.com/apache/cloudstack.git
Conflicts: core/src/com/cloud/async/AsyncJobVO.java core/src/com/cloud/async/SyncQueueVO.java server/src/com/cloud/api/ApiDispatcher.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/async/AsyncJobManagerImpl.java server/src/com/cloud/async/SyncQueueManager.java server/src/com/cloud/async/SyncQueueManagerImpl.java server/src/com/cloud/async/dao/SyncQueueDao.java server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java server/test/com/cloud/async/TestSyncQueueManager.java setup/db/create-schema.sql |
||
|---|---|---|
| .. | ||
| allocator | ||
| dao | ||
| download | ||
| listener | ||
| monitor | ||
| resource | ||
| secondary | ||
| snapshot | ||
| swift | ||
| upload | ||
| LocalStoragePoolListener.java | ||
| OCFS2Manager.java | ||
| OCFS2ManagerImpl.java | ||
| StorageManager.java | ||
| StorageManagerImpl.java | ||
| StorageMigrationCleanupMaid.java | ||