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	2013-01-06 17:30:00 -08:00
devcloud	Merge branch 'api_refactoring' into javelin	2013-01-08 12:36:04 -08:00
devcloud-kvm	Summary: Change url of tiny linux in devcloud-kvm.sql	2013-01-11 11:52:46 -07:00
git	Summary: Add Bugfix-for line to prepare-commit-msg	2012-11-07 10:07:07 -07:00
marvin	S3-backed Secondary Storage	2013-01-02 10:28:47 -08:00
waf	Patch from Gavin Lee: Change license to ASL2.0 in server and tools	2012-08-30 10:36:29 -04:00
whisker	CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content (as well as descriptor.xml).	2012-12-21 10:35:50 -05:00