mirror of https://github.com/apache/cloudstack.git
Conflicts: server/src/com/cloud/agent/AgentManager.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/host/dao/HostDao.java server/src/com/cloud/host/dao/HostDaoImpl.java server/src/com/cloud/resource/ResourceManagerImpl.java server/src/com/cloud/server/ManagementServerImpl.java server/src/com/cloud/storage/download/DownloadMonitorImpl.java server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java |
||
|---|---|---|
| .. | ||
| commands | ||
| doc | ||
| response | ||
| ApiDBUtils.java | ||
| ApiDispatcher.java | ||
| ApiGsonHelper.java | ||
| ApiResponseGsonHelper.java | ||
| ApiResponseHelper.java | ||
| ApiSerializerHelper.java | ||
| ApiServer.java | ||
| ApiServlet.java | ||
| EncodedStringTypeAdapter.java | ||
| ResponseObjectTypeAdapter.java | ||