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
..
src/com/cloud/hypervisor/kvm	Merge branch 'master' into javelin	2013-01-24 19:18:53 -08:00
test/com/cloud/hypervisor/kvm/resource	Another clean up for unnecessary parameter conn Clean up unused	2012-08-01 13:59:11 -07:00
.pydevproject	License header updates for the plugins folder.	2012-08-03 09:07:43 -04:00
agent-descriptor.xml	build kvm-agent.zip	2012-10-02 15:38:34 -07:00
pom.xml	Summary: Get started with packaging cloud-agent	2013-01-07 22:18:01 +01:00