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
..
bindir	fixing utils license header	2012-06-06 23:06:02 -04:00
certs	Update fail-safe keystore with RSA private key	2011-07-25 18:55:16 -07:00
conf	reverting a local change	2013-07-18 16:22:08 +05:30
src	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
test	CLOUDSTACK-5355: addImageStore should not log password in clear text in	2013-12-03 16:46:02 -08:00
pom.xml	Merge remote-tracking branch 'origin/spring-modularization'	2013-10-23 11:14:42 -07:00