Anthony Xu 0847ccfe97 XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster ... Conflicts: engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java server/src/com/cloud/template/TemplateManagerImpl.java		2013-12-05 01:17:56 -08:00
..
com/cloud	XS VMmetadata platform contains virtual platform related info, CS should save platform info in DB to migrate the VM to other Cluster	2013-12-05 01:17:56 -08:00
org/apache	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00