frank 6aaf3d5ae0 Merge branch 'cvm' ... Conflicts: api/src/com/cloud/api/BaseCmd.java api/src/com/cloud/storage/Storage.java cloud.spec core/src/com/cloud/storage/template/DownloadManagerImpl.java server/src/com/cloud/agent/manager/AgentManagerImpl.java server/src/com/cloud/configuration/DefaultComponentLibrary.java server/src/com/cloud/deploy/FirstFitPlanner.java server/src/com/cloud/host/dao/HostDao.java server/src/com/cloud/storage/StorageManagerImpl.java server/src/com/cloud/vm/UserVmManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java utils/src/com/cloud/utils/SerialVersionUID.java		2011-08-08 14:14:09 -07:00
..
doc	bug 10193: modified description field for login api call in API docs	2011-06-20 16:25:08 -07:00
response	Keep "encode.api.response" parameter in ApiServer class; initialize it as a part of init() method	2011-06-21 11:05:57 -07:00
ApiDBUtils.java	Bug 10560 - Baremetal template created 5 entries when added (edit)	2011-07-05 19:35:15 -07:00
ApiDispatcher.java	bug 7826: Check for correct date range. Make DateFormat strict (turn off lenient)	2011-08-05 19:44:44 +05:30
ApiGsonHelper.java	bug 10232: Introduced new gson builder - used for api reponse only	2011-06-13 13:19:20 -07:00
ApiResponseGsonHelper.java	bug 10232: Introduced new gson builder - used for api reponse only	2011-06-13 13:19:20 -07:00
ApiResponseHelper.java	bug 10994: Fixed NPE in destroySystemVm api	2011-08-05 12:46:20 -07:00
ApiSerializerHelper.java	Add license header to files	2011-04-14 11:23:14 -07:00
ApiServer.java	Merge branch 'cvm'	2011-08-08 14:14:09 -07:00
ApiServlet.java	bug 9336: securityGroups can be used by other securityGroups in the same domain only; no cross domain SG authentication	2011-04-22 11:35:29 -07:00
EncodedStringTypeAdapter.java	Keep "encode.api.response" parameter in ApiServer class; initialize it as a part of init() method	2011-06-21 11:05:57 -07:00
ResponseObjectTypeAdapter.java	bug 10232: Introduced new gson builder - used for api reponse only	2011-06-13 13:19:20 -07:00