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
..
api	merge compiles	2013-01-09 04:41:27 -08:00
components-api	starting unit test	2012-11-20 18:57:19 -08:00
compute	fixed pom problem in network component	2012-11-05 09:22:50 -08:00
network	fixed pom problem in network component	2012-11-05 09:22:50 -08:00
orchestration	removed componentlocator and inject	2013-01-10 11:05:20 -08:00
planning/src/org/apache/cloudstack/platform/planning	Added engine	2012-11-05 09:14:14 -08:00
schema	Added engine	2012-11-05 09:14:14 -08:00
service	made changes to work with the new injection stuff	2012-12-28 16:44:26 -08:00
storage	Pull changes from master into javelin	2013-01-12 06:02:54 -08:00
pom.xml	Getting things to compile	2012-12-28 16:07:56 -08:00