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
..
bindir	fixing utils license header	2012-06-06 23:06:02 -04:00
certs	Update fail-safe keystore with RSA private key	2011-07-25 18:55:16 -07:00
conf	CLOUDSTACK-8433: remove awsapi db usage and add upgrade cleanup path	2015-05-06 15:22:04 +02:00
src	Merge branch 'pr/547'	2015-08-10 19:00:53 -06:00
test	unittesting: test resolution is not guaranteed to be exact	2015-07-29 10:49:16 +02:00
pom.xml	findbugs: equals unit tests	2015-07-07 13:48:19 +02:00