Alex Huang 8d21f49ec9 Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged		2013-07-03 15:01:23 -07:00
..
com/cloud/vm	Another merge to pull in object store fix. Also to check how changes that are applied to both master and vmsync are merged	2013-07-03 15:01:23 -07:00
org/apache/cloudstack/engine/provisioning/test	Moved VOs into the schema	2013-05-14 13:06:48 -07:00
resource	Fix license for xml files in javelin	2013-01-12 06:31:47 -08:00