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
..
acl/static-role-based	plugin: Remove memory mapping of apiname and class name in StaticRoleBasedAPIAccessChecker	2013-01-02 18:43:59 -08:00
deployment-planners	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
file-systems/netapp	api: Annotate all remaining cmd classes with APICommand name field	2012-12-28 01:28:47 -08:00
host-allocators/random	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
hypervisors	api: Annotate netscaler apis, remove IdentityMapper from everywhere	2013-01-04 17:09:40 -08:00
network-elements	Get latest changes, merge branch 'master' into api_refactoring	2013-01-04 22:21:20 -08:00
storage-allocators/random	Start removing the old ant build files	2012-12-07 15:58:56 +01:00
user-authenticators	Merge branch 'master' into test-merge-api	2012-12-23 13:54:46 -08:00
pom.xml	plugin: ACL Static Role Based api access checker	2013-01-02 17:06:19 -08:00