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
..
2013-01-11 15:33:15 -08:00
2010-08-11 09:13:29 -07:00
2010-08-11 09:13:29 -07:00
2013-01-06 13:56:56 -08:00
2012-08-01 13:49:10 -04:00
2011-09-01 16:01:28 -07:00
2012-12-05 14:40:45 -08:00
2013-01-06 13:56:56 -08:00
2013-01-12 06:02:54 -08:00
2012-08-01 13:49:10 -04:00
2012-10-11 12:08:28 -07:00
2013-01-10 18:51:30 -08:00
2010-08-11 09:13:29 -07:00
2012-12-13 22:46:29 -08:00
2012-12-13 22:46:29 -08:00
2012-08-01 13:49:10 -04:00
2012-09-13 16:29:01 +02:00
2013-01-06 13:56:56 -08:00
2013-01-06 13:56:56 -08:00
2012-12-22 21:47:05 -08:00
2010-08-11 09:13:29 -07:00
2013-01-06 13:56:56 -08:00
2013-01-06 13:56:56 -08:00
2013-01-06 13:56:56 -08:00
2012-12-17 20:43:37 -08:00
2012-12-17 20:43:37 -08:00
2012-12-17 20:43:37 -08:00
2013-01-06 13:56:56 -08:00
2012-08-01 13:49:10 -04:00
2012-08-01 13:49:10 -04:00
2010-08-11 09:13:29 -07:00
2013-01-06 13:56:56 -08:00
2010-08-11 09:13:29 -07:00