etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine/storage
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
..
backup add backup/snapshot project 2012-12-03 13:39:44 -08:00
image merge from latest pull 2013-01-10 11:07:11 -08:00
imagemotion refactor the motion service api 2013-01-10 10:27:05 -08:00
integration-test change the top level async call using future 2013-01-04 17:17:57 -08:00
snapshot add backup/snapshot project 2012-12-03 13:39:44 -08:00
src/org/apache/cloudstack/storage Pull changes from master into javelin 2013-01-12 06:02:54 -08:00
volume Another round of fixes after merge 2013-01-11 15:21:04 -08:00
pom.xml 1st try to add async api in the storage component, it's ugly like hell 2012-12-14 18:25:40 -08:00
storage.ucls add uml class diagram generated by objectaid 2012-12-28 16:51:25 -08:00