mirror of https://github.com/apache/cloudstack.git
- 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> |
||
|---|---|---|
| .. | ||
| db | ||
| log | ||
| net | ||
| testcase | ||
| DummyImpl.java | ||
| DummyInterface.java | ||
| DummyPremiumImpl.java | ||
| QualifierTest.java | ||
| StringUtilsTest.java | ||
| TestProfiler.java | ||