etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api
History
Kelven Yang 2ee8fd2152 Merge branch 'master' into vmsync 
Conflicts:
	plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImgException.java
	server/src/com/cloud/async/AsyncJobManagerImpl.java
	server/src/com/cloud/async/SyncQueueManager.java
	server/src/com/cloud/hypervisor/kvm/discoverer/LxcServerDiscoverer.java
	server/src/com/cloud/storage/VolumeManagerImpl.java
	utils/src/com/cloud/utils/component/AdapterList.java
 		2013-04-09 14:39:09 -07:00
..
src Merge branch 'master' into vmsync 2013-04-09 14:39:09 -07:00
test CLOUDSTACK-658 - Scaleup vm support for Xenserver 2013-03-28 16:43:37 +05:30
pom.xml CLOUDSTACK-1317: Bump CloudStack package version to 4.2.0-SNAPSHOT in all poms 2013-02-20 16:42:56 +05:30