etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server
History
Rohit Yadav 5119785cf7 Get latest changes, merge branch 'master' into api_refactoring 
Conflicts:
	api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
	server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
	server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 		2013-01-04 22:21:20 -08:00
..
conf License header updates for the server folder. 2012-08-03 09:41:27 -04:00
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src/com/cloud Get latest changes, merge branch 'master' into api_refactoring 2013-01-04 22:21:20 -08:00
test Get latest changes, merge branch 'master' into api_refactoring 2013-01-04 22:21:20 -08:00
pom.xml server: Exclude ListPerf test in as it requires real MS and DB 2013-01-04 18:25:13 -08:00