Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
marvin	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -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	Summary: Mavenize marvin on master	2012-10-27 11:56:25 +05:30
setup.py	Marvin doesn't require python 2.7, the tests do	2012-12-07 17:17:02 -08:00