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
..
api	CLOUDSTACK-9062: Improve S3 implementation.	2015-11-19 15:29:10 +01:00
components-api	CLOUDSTACK-8958: add dedicated ips to domain (account for now)	2015-11-16 10:17:40 +01:00
network	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00
orchestration	Merge pull request #942 from rafaelweingartner/lrg-cs-hackday-011	2015-12-02 22:07:12 +01:00
schema	Merge release branch 4.6 to master	2015-12-03 10:35:00 +01:00
service	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00
storage	Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.	2015-11-21 18:31:11 -02:00
pom.xml	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00