mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
356866c72b
- 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>