Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots ... Conflicts: plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java setup/db/db/schema-410to420.sql		2013-08-01 10:47:36 +08:00
..
api	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
ha	Removed the getByTypeAndId() method and replace it with getById method	2013-07-22 20:06:04 -07:00
hypervisor	fix CLOUDSTACK-3591 add usage recording for VM snapshots	2013-08-01 10:47:36 +08:00
network	Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms.	2013-07-22 11:48:11 -07:00
storage/resource	CLOUDSTACK-3107: fix attach upload volume	2013-07-29 19:00:16 -07:00