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

..

src/org/apache/cloudstack/acl

Pull changes from master into javelin

2013-01-12 06:02:54 -08:00

pom.xml

plugin: ACL Static Role Based api access checker

2013-01-02 17:06:19 -08:00