Prasanna Santhanam 5f25f1f996 marvin_refactor: Fixing conflicts from fresh rebase with master ... Conflicts: client/tomcatconf/componentContext.xml.in Signed-off-by: Prasanna Santhanam <tsp@apache.org>		2013-10-31 13:54:20 +05:30
..
marvin	marvin_refactor: Fixing conflicts from fresh rebase with master	2013-10-31 13:54:20 +05:30
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	marvin_refactor: changes to pom for sync facility	2013-10-31 13:54:18 +05:30
setup.py	marvin_refactor: id is attribute only when it is in required args	2013-10-31 13:54:19 +05:30