mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
Conflicts: api/src/com/cloud/api/ApiConstants.java client/tomcatconf/commands.properties.in server/src/com/cloud/api/ApiDBUtils.java server/src/com/cloud/uuididentity/dao/IdentityDao.java server/src/com/cloud/uuididentity/dao/IdentityDaoImpl.java setup/db/create-schema.sql