Remi Bergsma cdfcea3da2 Merge release branch 4.6 to master ... * 4.6: [UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal users CLOUDSTACK-4787: Allow users to select disk controller for VM/template CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere		2015-12-12 22:29:19 +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-12 22:29:19 +01:00
test	Merge release branch 4.6 to master	2015-12-07 21:36:36 +01:00
pom.xml	Updating pom.xml version numbers for release 4.7.0-SNAPSHOT	2015-11-15 18:54:13 +01:00