etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test/org/apache/cloudstack
History
Alena Prokharchyk 7b24a7640c Merge branch 'master' into internallb1 
Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	setup/db/db/schema-410to420.sql
 		2013-04-29 16:12:10 -07:00
..
affinity CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200 2013-04-29 14:11:51 +05:30
lb InternalLb: 2013-04-26 15:22:19 -07:00
networkoffering Merge branch 'master' into internallb1 2013-04-29 16:12:10 -07:00
region CLOUDSTACK-653 : High Availability: implement GSLB (Global Server Load 2013-03-27 17:54:07 +05:30