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
..
resources/META-INF/cloudstack	CLOUDSTACK-8958: add dedicated ips to domain (account for now)	2015-11-16 10:17:40 +01:00
src	Merge release branch 4.6 to master	2015-12-03 10:35:00 +01:00
test/com/cloud/upgrade/dao	CLOUDSTACK-6594: Improve the logging in the util functions utilized by db upgrades currently. If the exception is to be ignored, dont log the stack trace and also dont log it in warn. Making them debug just to be little verbose during upgrade scenario.	2014-07-31 16:36:33 -07:00
pom.xml	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00