Remi Bergsma 3b511a139d Merge pull request #1155 from DaanHoogland/merge-4.6 ... Merge 4.6there is one (simple) conflict so for formailty's sake I make this a pull request. @utscweizhou en @remibergsma please have a look/test-run * pr/1155: CLOUDSTACK-9022: move storage.cleanup related global configurations to StorageManager CLOUDSTACK-9022: keep Destroyed volumes for sometime Signed-off-by: Remi Bergsma <github@remi.nl>		2015-12-03 19:53:56 +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	…
src	Merge release branch 4.6 to master	2015-12-03 10:35:00 +01:00
test	Merge pull request #943 from rafaelweingartner/lrg-cs-hackday-009	2015-12-03 10:27:55 +01:00
pom.xml	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00