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
..
com/cloud	Merge branch 'pr/547'	2015-08-10 19:00:53 -06:00
org/apache	CLOUDSTACK-8457: SAML auth plugin improvements for production usage	2015-06-29 12:31:51 +02:00