Mike Tutkowski 8b0266d12e Merge branch 'pr/547' ... * pr/547: CLOUDSTACK-8601. VMFS storage added as local storage can be re-added as shared storage. Fail addition of a VMFS shared storage pool in case it has already been added as local storage in CS. Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com>		2015-08-10 19:00:53 -06:00
..
resources/META-INF/cloudstack	Add missing licenses	2013-10-23 15:20:08 -07:00
src	Merge branch 'pr/547'	2015-08-10 19:00:53 -06:00
test	CLOUDSTACK-5236 : ability to identify where the user is from (ex. LDAP)	2015-03-16 14:53:53 +05:30
pom.xml	Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT	2014-10-29 14:54:23 +01:00