mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-02 20:02:29 +01:00
Conflicts: engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
Conflicts: engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java