Prachi Damle 4a1eaf45bd Merge branch 'master' into affinity_groups ... Conflicts: engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java setup/db/db/schema-410to420.sql		2013-04-10 11:34:30 -07:00
..
marvin	Merge branch 'master' into affinity_groups	2013-04-10 11:34:30 -07:00
CHANGES.txt	Missing LICENSE headers for sandbox and __init__.py's	2012-08-04 17:29:47 +05:30
DISCLAIMER.txt	Adding DISCLAIMER.txt to the marvin tool.	2012-10-17 12:27:00 -04:00
LICENSE.txt	CLOUDSTACK-326: Corrected marvin license file to be full ASLv2 license text	2012-10-12 16:41:17 -04:00
MANIFEST.in	Missing LICENSE headers for sandbox and __init__.py's	2012-08-04 17:29:47 +05:30
pom.xml	maven+marvin: Fix up the activation property	2013-04-10 16:16:41 +05:30
setup.py	marvin-nose: include the plugin as part of marvin install	2013-04-02 18:31:29 +05:30