cloudstack/api/src/com/cloud/storage
Rohit Yadav 296b49c2f8 Merge branch 'master' into test-merge-api
Conflicts:
	api/src/com/cloud/agent/api/BackupSnapshotCommand.java
	api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/resource/ResourceService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/api/response/SSHKeyPairResponse.java
	client/tomcatconf/commands.properties.in
	core/src/com/cloud/storage/SnapshotVO.java
	pom.xml
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/upgrade/dao/Upgrade40to41.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	setup/db/create-schema.sql
	setup/db/db/schema-40to410.sql

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2012-12-23 13:54:46 -08:00
..
snapshot Remove IdentityProxy from Response classes. 2012-12-18 16:33:12 -08:00
template committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
GuestOS.java Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse. 2012-12-17 18:01:31 -08:00
GuestOsCategory.java Remove IdentityProxy from GuestOSResponse and GuestOSCategoryResponse. 2012-12-17 18:01:31 -08:00
S3.java Backs NFS-based secondary storage with an S3-compatible object store. Periodically, a reaper thread synchronizes templates and ISOs stored on a NFS secondary storage mount with a configured S3 object store. It also pushes snapshots to the object store when they are created and downloads them in other zones on-demand. In addition to permitting the use of commodity or IaaS storage solutions for static assets, it provides a means of automatically synchronizing template and ISO assets across multiple zones. 2012-12-13 23:18:37 -08:00
Snapshot.java Add back Identity interface to most VO class to avoid cast error in 2012-12-22 22:35:09 -08:00
Storage.java Adds CLVM as an option for primary storage. It copies most of the RBD bits, in most cases simply adding an 'else if' or similar. In the managesnapshot.sh we add the ability to manipulate snapshots for the CLVM volumes, as well as a few minor fixes like adjusting the usage for the -b option to reflect that it accepts four arguments (note that it already accepted four args, it just wasn't reflected in the usage). 2012-08-10 13:33:06 -07:00
StorageGuru.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
StoragePool.java api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
StoragePoolStatus.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00
StorageService.java api: Refactor command and response classes to org.apache.cloudstack.api.* 2012-12-07 19:23:24 -08:00
StorageStats.java api_refactor: refactor project apis 2012-12-03 22:10:32 -08:00
Swift.java Remove IdentityProxy from Response classes. 2012-12-18 16:33:12 -08:00
Upload.java Remove IdentityProxy from BaseResponse, ExtractResponse. Now 2012-12-20 16:52:52 -08:00
VMTemplateStorageResourceAssoc.java Remove @author tag from non third-party source files in api folder 2012-08-13 15:17:22 +08:00
Volume.java Remove IdentityProxy from Response classes. 2012-12-18 16:33:12 -08:00
VolumeStats.java committing Chip Childers patches fixing licensing headers 2012-06-12 12:32:58 -04:00