Girish Shilamkar cff7e39339 Fixed few hunks which were incorrect. ... While adding certain marvin related fixes from master to 4.2 branch incorrect hunks were added. Fixed them.		2013-11-11 15:10:29 +05:30
..
marvin	Fixed few hunks which were incorrect.	2013-11-11 15:10:29 +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	Updating pom.xml version numbers for release 4.2.1-SNAPSHOT	2013-10-03 17:13:17 -07:00
setup.py	Integration test for advanced zone with security groups	2013-05-22 15:39:22 -07:00