mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-15 18:12:35 +01:00
Conflicts: core/src/com/cloud/async/SyncQueueItemVO.java core/src/com/cloud/async/SyncQueueVO.java server/src/com/cloud/async/dao/SyncQueueDaoImpl.java server/src/com/cloud/async/dao/SyncQueueItemDaoImpl.java