etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test
History
Murali Reddy 45110b65dc Merge branch 'master' into gslb-wip 
Conflicts:
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/region/Region.java
	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	server/src/org/apache/cloudstack/region/RegionVO.java
 		2013-03-19 17:20:44 +05:30
..
com/cloud CLOUDSTACK-1218: Use the first IP in the first vlan range for VR in shared network 2013-03-14 13:13:31 -07:00
org/apache/cloudstack/region Merge branch 'master' into gslb-wip 2013-03-19 17:20:44 +05:30
resources From c72615de97b007517fb324044cb4625258c5fc61 Mon Sep 17 00:00:00 2001 2013-02-25 14:57:57 -08:00
async-job-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00