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
..
src/org/apache/cloudstack	add inital swift support	2013-07-13 02:07:03 -07:00
test/org/apache/cloudstack/engine/subsystem/api/storage	Fix a bug in create cache object for S3.	2013-05-10 17:53:32 -07:00
pom.xml	merge master	2013-05-11 15:28:43 +05:30