gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-05 18:37:13 +00:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity
affinity_groups
cloudstack-mirror/server/test/org/apache/cloudstack
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
..
affinity Merge branch 'master' into affinity_groups 2013-04-05 13:49:20 -07:00
networkoffering Update unit test configuraitons to new custom Spring AOP 2013-03-29 11:12:36 -07:00
region CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load 2013-03-27 17:54:07 +05:30