mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Conflicts: api/src/org/apache/cloudstack/api/response/UserVmResponse.java engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java server/src/com/cloud/api/query/vo/UserVmJoinVO.java server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java