cloudstack

mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00

History

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

apidoc

apidoc: Remove api discovery from toc

2013-01-11 09:46:18 -08:00

bugs-wiki

fixing license headers in marvin

2012-07-04 18:45:08 -04:00

build

docs: Build the installation guide instead of "all"

2012-10-22 12:08:11 +02:00

cli

cli: Cosmetic fix for prompt of cloudmonkey