etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/tools/marvin
History
Murali Reddy a718d353f7 Merge branch 'master' into portablepublicip 
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/addr/PublicIp.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-05-13 21:22:19 +05:30
..
marvin added integration tests for testing portable ip ranges 2013-05-13 20:05: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 Fixing the gmaven configuration for marvin/pom.xml 2013-05-07 17:06:15 +05:30
setup.py marvin: build fails when no setuptools/distribute found 2013-05-13 11:21:38 +05:30