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
..
WEB-INF	Loadable components to be in separted Spring component bundling	2013-01-11 15:33:15 -08:00
bindir	License header update for the client folder	2012-08-01 13:49:10 -04:00
distro	init: Explicitly set the HOME variable to the homedir of the user cloud	2013-01-09 13:11:21 +01:00
tomcatconf	Pull changes from master into javelin	2013-01-12 06:02:54 -08:00
pom.xml	merge from master	2013-01-09 05:20:36 -08:00