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
..
kvm	umount loop device. If patch disk created from loop, then need to umount it in loop device, otherwise, you can only create 7 routers on one kvm host	2013-01-18 14:27:40 -08:00
xenserver	All merge conflicts resolved	2013-01-18 12:14:57 -08:00
versions.sh	license header changes for scripts folder from Chip Childers	2012-06-23 00:58:00 -04:00