etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/api/src/com/cloud
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
..
agent/api Get latest changes, merge branch 'master' into api_refactoring 2013-01-04 22:21:20 -08:00
alert api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
api/commands Remove IdentityProxy and IdentityTypeAdapter class. 2013-01-09 17:40:58 -08:00
async api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
capacity api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
cluster api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
configuration api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
consoleproxy committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
dao api: Fix findByXId to findByUuid in EntityManager and ApiDispatcher 2012-12-18 17:44:17 -08:00
dc api: Extend to infra. interface entities that are not associated with any account 2013-01-06 15:36:59 -08:00
deploy api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
domain api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
event api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
exception Remove IdentityProxy and IdentityTypeAdapter class. 2013-01-09 17:40:58 -08:00
host api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
hypervisor api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
network Pull changes from master into javelin 2013-01-12 06:02:54 -08:00
offering api: Extend to infra. interface entities that are not associated with any account 2013-01-06 15:36:59 -08:00
org api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
projects api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
resource api: Refactor and move s3 to api.command.admin.storage 2013-01-05 15:30:38 -08:00
serializer api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
server Create DB view for ListStoragePools API performance optimization. 2013-01-08 12:33:18 -08:00
storage Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
template Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00
user Pull changes from master into javelin 2013-01-12 06:02:54 -08:00
uservm api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
vm Merge branch 'api_refactoring' into javelin 2013-01-08 12:36:04 -08:00