etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/setup
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
..
bindir BUG-ID: CLOUDSTACK-1557 2013-03-13 14:20:41 -07:00
db Merge branch 'master' into affinity_groups 2013-04-05 13:49:20 -07:00
dev marvin changes to do an pre-integration and integration test 2013-04-02 18:31:29 +05:30