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
..
WEB-INF	BigSwitch networking plugin update	2013-03-29 18:54:48 +05:30
bindir	Summary: update packaging	2013-02-05 10:47:42 +01:00
distro	init: Explicitly set the HOME variable to the homedir of the user cloud	2013-01-09 13:11:21 +01:00
tomcatconf	Merge branch 'master' into vmsync	2013-04-09 14:39:09 -07:00
pom.xml	Revert "maven: Do not copy the management server configuration to the webapp"	2013-04-04 11:13:13 +02:00