etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src
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
..
com/cloud Merge branch 'master' into vmsync 2013-04-09 14:39:09 -07:00
org/apache/cloudstack region id is not Long, its integer changing the regionId parameter in 2013-04-09 19:23:13 +05:30