cloudstack/tools
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
..
apidoc Revert "apidoc: Remove api discovery from toc" 2013-01-14 20:55:13 -08:00
bugs-wiki fixing license headers in marvin 2012-07-04 18:45:08 -04:00
build docs: Build the installation guide instead of "all" 2012-10-22 12:08:11 +02:00
cli cli: fix cloudmonkey's pipe-ability 2013-01-24 14:47:45 -08:00
devcloud Merge branch 'master' into javelin 2013-01-24 19:18:53 -08:00
devcloud-kvm maven: create dependency, deploydb on developer first and then on devcloud 2013-01-22 16:32:57 -08:00
git Summary: Add Bugfix-for line to prepare-commit-msg 2012-11-07 10:07:07 -07:00
marvin Summary: adding resizeVolume api call 2013-01-16 17:43:35 -07:00
waf Patch from Gavin Lee: Change license to ASL2.0 in server and tools 2012-08-30 10:36:29 -04:00
whisker CLOUDSTACK-697: Reordered the LICENSE and NOTICE file content (as well as descriptor.xml). 2012-12-21 10:35:50 -05:00