Rohit Yadav a948a89378 Sync updates: Merge branch 'master' into api_refactoring ... Conflicts: server/src/com/cloud/api/commands/AddTrafficMonitorCmd.java server/src/com/cloud/api/commands/ListTrafficMonitorsCmd.java Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-07 10:38:43 -08:00
..
allocator	CS-14277	2012-09-11 17:22:43 +05:30
dao	Merge branch 'master' into api_refactoring	2013-01-02 13:57:55 -08:00
download	Remove @author tag from non third-party source files in server folder	2012-08-13 15:17:31 +08:00
listener	CLOUDSTACK-251 :	2012-10-04 11:31:53 -07:00
monitor	Remove @author tag from non third-party source files in server folder	2012-08-13 15:17:31 +08:00
resource	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
s3	api: Refactor and move s3 to api.command.admin.storage	2013-01-05 15:30:38 -08:00
secondary	Only use the PremiumSecondaryStorageResource if VmWare is the hypervisor	2012-08-24 15:57:18 +02:00
snapshot	Merge branch 'master' into test-merge-api	2012-12-23 13:54:46 -08:00
swift	api: move and group all under command, org.apache.cloudstack.command.*	2012-12-07 18:30:54 -08:00
upload	Remove IdentityProxy from BaseResponse, ExtractResponse. Now	2012-12-20 16:52:52 -08:00
LocalStoragePoolListener.java	CS-14277	2012-09-11 17:22:43 +05:30
OCFS2Manager.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
OCFS2ManagerImpl.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
StorageManager.java	Create DB views to improve ListHostsCmd performance.	2012-12-22 21:47:05 -08:00
StorageManagerImpl.java	Sync updates: Merge branch 'master' into api_refactoring	2013-01-07 10:38:43 -08:00
StorageMigrationCleanupMaid.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00