Harikrishna Patnala a8ad908666 CLOUDSTACK-3703: change service offering of stopped vm on ... Conflicts: server/test/com/cloud/vm/UserVmManagerTest.java		2013-07-27 19:52:30 +05:30
..
dao	merge master	2013-05-11 15:28:43 +05:30
snapshot	use hypervisor capabilities to control if vm snapshot is enabled for hypervisors	2013-04-10 12:36:42 +08:00
DeploymentPlanningManagerImplTest.java	CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.	2013-07-16 10:53:06 -07:00
UserVmManagerTest.java	CLOUDSTACK-3703: change service offering of stopped vm on	2013-07-27 19:52:30 +05:30
VirtualMachineManagerImplTest.java	Move the rest of the generics out of virtualmachinemanager	2013-07-25 19:00:25 -07:00