Edison Su 0c1ae20e77 add inital swift support ... Conflicts: server/src/com/cloud/resource/ResourceManagerImpl.java server/test/com/cloud/resource/MockResourceManagerImpl.java		2013-07-13 02:07:03 -07:00
..
qcow2	CLOUDSTACK-2970: wait is in seconds in command	2013-06-14 17:57:34 -07:00
secondary	add inital swift support	2013-07-13 02:07:03 -07:00
checkchildren.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00
installIso.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00