etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,062 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
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
Prachi Damle b266ad4612 Adding a unit test for the new affinity groups API 2013-04-01 11:08:16 -07:00