Will Stevens 88cd182272 Forward merged 4.8 to master and fixed conflicts in #1331		2016-05-19 12:08:08 -04:00
..
resources/META-INF/cloudstack/secondary-storage-discoverer	Moved the secondary storage service into its own server directory	2014-02-05 01:38:24 +00:00
src/org/apache/cloudstack/storage	Forward merged 4.8 to master and fixed conflicts in #1331	2016-05-19 12:08:08 -04:00
test/org/apache/cloudstack/storage/resource	Fix Sync of template.properties in Swift	2016-05-13 22:08:16 +00:00
pom.xml	Forward merged 4.8 to master and fixed conflicts in #1331	2016-05-19 12:08:08 -04:00