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
..
bindir	Summary: Adding utility to make system vm maintenance easier for admins	2012-11-16 10:17:12 -07:00
conf	Summary: Polish and shine	2013-01-15 09:18:24 +01:00
distro	agent: Send JSVC error output to syslog	2012-09-14 23:19:46 +02:00
scripts	Move KVM related code into plugins/hypervisor/kvm, a new jar file is	2012-07-30 14:55:47 -07:00
src/com/cloud/agent	Keep removing	2013-01-10 14:46:52 -08:00
test/com/cloud/agent	Keep removing	2013-01-10 14:46:52 -08:00
pom.xml	Summary: Get started with packaging cloud-agent	2013-01-07 22:18:01 +01:00