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
Prachi Damle ca1a7948f1 Merge branch 'master' into affinity_groups 
Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/componentContext.xml.in
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/user/AccountManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-05 13:49:20 -07:00
..
marvin Merge branch 'master' into affinity_groups 2013-04-05 13:49:20 -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