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
..
affinity	Remove IAMEntityType to use existing VO interface class to annotate	2014-03-17 17:19:55 -07:00
engine/cloud/entity/api/db	engine: Add Upgrade path from 4.5.0 to 4.5.1	2015-03-12 13:02:45 +05:30
lb	Reformatted all of the code.	2013-11-21 06:15:26 -08:00
region	removed executable flags from java classes	2014-11-23 19:49:01 +01:00
resourcedetail	Fix the license headers Nitin forgot.	2014-06-25 16:07:00 +02:00
storage/datastore/db	Merge branch 'pr/547'	2015-08-10 19:00:53 -06:00