Nitin Mehta c11dbad9c9 merge master		2013-05-11 15:28:43 +05:30
..
agent	merge master	2013-05-11 15:28:43 +05:30
api/commands	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
configuration	Fixed the problems with simulator. Turned off the skip tests	2013-01-21 10:37:53 -08:00
resource	QuickCloud: option to build with componentContext tailored for quickcloud	2013-04-09 14:45:26 -07:00
server	CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl	2013-02-05 16:49:34 +05:30
simulator	merge master	2013-05-11 15:28:43 +05:30