etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/utils
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
..
bindir fixing utils license header 2012-06-06 23:06:02 -04:00
certs Update fail-safe keystore with RSA private key 2011-07-25 18:55:16 -07:00
conf simulator: resurrect simulator hypervisor as plugin 2012-12-23 19:28:57 -08:00
src/com/cloud/utils Pull changes from master into javelin 2013-01-12 06:02:54 -08:00
test Pull changes from master into javelin 2013-01-12 06:02:54 -08:00
pom.xml merge from master 2013-01-09 05:20:36 -08:00