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
..
2013-01-10 15:55:42 -08:00
2012-10-04 21:04:58 -07:00
2012-11-28 10:21:17 +08:00
2012-09-21 19:12:43 -04:00
2012-10-04 21:04:58 -07:00
2012-09-21 19:12:43 -04:00
2012-10-04 11:42:25 +05:30
2012-10-04 11:42:25 +05:30
2012-11-28 10:21:17 +08:00
2012-11-28 10:21:17 +08:00
2012-11-28 10:21:17 +08:00
2012-11-28 10:21:17 +08:00
2013-01-08 15:04:19 -06:00
2012-11-07 11:40:51 -06:00
2012-11-07 11:40:51 -06:00
2012-10-19 09:20:41 -04:00
2012-10-04 21:04:58 -07:00
2012-11-28 10:21:17 +08:00
2012-09-21 19:12:43 -04:00
2012-11-07 11:40:51 -06:00
2012-11-07 11:40:51 -06:00
2012-11-07 11:40:51 -06:00
2012-10-04 21:04:58 -07:00
2012-11-07 11:40:51 -06:00
2012-11-07 11:40:51 -06:00
2012-11-28 10:21:17 +08:00
2012-11-28 10:21:17 +08:00
2012-10-11 17:42:25 -07:00
2012-10-11 17:42:25 -07:00
2012-10-11 17:42:25 -07:00
2012-11-28 10:21:17 +08:00
2012-10-22 12:22:08 -04:00
2012-11-28 10:21:17 +08:00
2012-11-28 10:21:17 +08:00
2012-11-07 11:40:51 -06:00
2012-09-21 19:12:43 -04:00
2012-09-14 11:20:45 -07:00
2012-11-07 11:40:51 -06:00
2012-11-28 10:21:17 +08:00
2012-10-02 12:50:11 -07:00
2012-11-28 10:21:17 +08:00
2012-11-07 11:40:51 -06:00
2012-11-07 11:40:51 -06:00
2012-10-08 23:43:38 -04:00
2012-09-14 11:20:45 -07:00