Daan Hoogland f9775de8ff Merge release branch 4.6 to master ... * 4.6: CLOUDSTACK-9022: move storage.cleanup related global configurations to StorageManager CLOUDSTACK-9022: keep Destroyed volumes for sometime Conflicts: server/src/com/cloud/storage/StorageManagerImpl.java		2015-12-03 10:35:00 +01:00
..
conf	CLOUDSTACK-9062: Improve S3 implementation.	2015-11-19 15:29:10 +01:00
resources	Merge branch 'volume-upload' into master	2015-04-29 11:12:53 +05:30
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	Merge release branch 4.6 to master	2015-12-03 10:35:00 +01:00
test	Merge pull request #841 from karuturi/CLOUDSTACK-8868	2015-12-03 09:58:52 +01:00
pom.xml	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00