Jessica Wang 98bc240d2a Revert "Dedicate Public IP range" ... This reverts commit d6ed8d7cb5. Conflicts: server/test/com/cloud/configuration/ConfigurationManagerTest.java		2013-04-08 17:15:51 -07:00
..
marvin	Revert "Dedicate Public IP range"	2013-04-08 17:15:51 -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+simulator: Changes to the lifecycle steps	2013-04-02 19:56:33 +05:30
setup.py	marvin-nose: include the plugin as part of marvin install	2013-04-02 18:31:29 +05:30