Rohit Yadav 38eaa04b98 Pull changes from master into javelin ... - Disables simulator plugin, breaks build, available via simulator profile - Fixes spring injections - Fix api,acl plugins, ApiServer, ApiDispatcher - Fix other merge conflicts Conflicts: docs/en-US/external-firewalls-and-load-balancers.xml plugins/acl/static-role-based/src/org/apache/cloudstack/acl/StaticRoleBasedAPIAccessChecker.java server/src/com/cloud/api/ApiDispatcher.java server/src/com/cloud/api/ApiServer.java server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java utils/test/com/cloud/utils/log/CglibThrowableRendererTest.java Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-12 06:02:54 -08:00
..
dao	CLOUDSTACK-799: Redundant router: Speed up RvR status update	2013-01-05 21:02:37 -08:00
MockConfigurationManagerImpl.java	Merge branch 'api_refactoring' into javelin	2013-01-08 12:36:04 -08:00
MockNetworkManagerImpl.java	Pull changes from master into javelin	2013-01-12 06:02:54 -08:00
MockResourceLimitManagerImpl.java	Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.	2013-01-02 17:38:58 -08:00
MockSite2SiteVpnManagerImpl.java	api: Refactor command and response classes to org.apache.cloudstack.api.*	2012-12-07 19:23:24 -08:00
MockVpcManagerImpl.java	Fix issues after another round of merge	2013-01-11 16:54:32 -08:00
VpcApiUnitTest.java	Fix issues after another round of merge	2013-01-11 16:54:32 -08:00