Min Chen 956e8301c2 CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes ... table and volume_store_ref. Conflicts: server/src/com/cloud/storage/VolumeManagerImpl.java		2013-07-23 15:06:34 -07:00
..
src/org/apache/cloudstack	CLOUDSTACK-3716: State of expunged volumes are not consistent in volumes	2013-07-23 15:06:34 -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