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	ElbVmMapDaoTest requires active DB backend for tests, hence jenkins test fails.	2012-08-16 12:59:00 -07:00
security	Fix issues after another round of merge	2013-01-11 16:54:32 -08:00
MockNetworkManagerImpl.java	NetworkManagerImpl: Add method to getNetwork by uuid	2013-01-11 18:44:19 -08:00