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
..
com/cloud	Get latest changes, merge branch 'master' into api_refactoring	2013-01-04 22:21:20 -08:00
resources	Patch from Gavin Lee: Change license to ASL2.0 in server and tools	2012-08-30 10:36:29 -04: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