cloudstack

mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00

History

Rohit Yadav 356866c72b Merge branch 'master' into javelin

- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

2013-01-24 19:18:53 -08:00

acl/static-role-based

All merge conflicts resolved

2013-01-18 12:14:57 -08:00

api

Merge branch 'master' into javelin

2013-01-24 19:18:53 -08:00

deployment-planners

Separate loadable components like Gurus, Elements, Adapters to componentContext.xml

2013-01-16 16:33:59 -08:00

file-systems/netapp

spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl