etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
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
..
conf debian: Package ulimits and sudo rules 2013-03-14 15:55:32 +01:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src Merge branch 'master' into gslb-wip 2013-03-19 17:20:44 +05:30
test Merge branch 'master' into gslb-wip 2013-03-19 17:20:44 +05:30
pom.xml ignore the tests looking for db 2013-03-01 12:04:06 +05:30