cloudstack/server/test/com/cloud
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
..
agent Making unit tests work 2013-01-22 11:18:51 -08:00
alert Network-refactor: verify injection is correct. Verify that dhcp service providers and ip deployers get injected independently in addition to the list of network elements 2013-01-09 15:49:02 -08:00
api Fix some bugs and add java integration test for api rate limit plugin. 2013-01-17 15:13:51 -08:00
async Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
keystore commit ba3fef5d0650c42463d0f225f4ca14b5f9046c44 2012-12-17 17:44:39 -08:00
network unit test works again 2013-01-24 14:36:44 -08:00
projects Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
resource CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
snapshot Fix Snapshot unit testcase. 2013-01-24 16:05:03 -08:00
storage/dao Fix StoragePool unit testcase. 2013-01-24 16:11:35 -08:00
upgrade Fix issues after another round of merge 2013-01-11 16:54:32 -08:00
user Making unit tests work 2013-01-22 11:18:51 -08:00
vm More changes for deployVM flow. 2013-01-22 12:54:07 -08:00
vpc add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00