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	CLOUDSTACK-7847: add max.domain.* in global setting and display domain resources in listDomainsCmd response	2014-12-02 11:52:10 +01:00
src	Merge branch 'pr/547'	2015-08-10 19:00:53 -06:00
test/com/cloud/upgrade/dao	CLOUDSTACK-6594: Improve the logging in the util functions utilized by db upgrades currently. If the exception is to be ignored, dont log the stack trace and also dont log it in warn. Making them debug just to be little verbose during upgrade scenario.	2014-07-31 16:36:33 -07:00
pom.xml	Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT	2014-10-29 14:54:23 +01:00