cloudstack/server/src/com/cloud
Likitha Shetty f03dcdab19 [CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes."
This reverts commit 3a91500173.

Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java
2013-11-06 19:07:33 +05:30
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl CLOUDSTACK-4337 Dedicated Resources: Zone dedicated to an account should only be visible and accessible to that account 2013-09-03 20:02:59 -07:00
agent/manager Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
alert Add Manage Context framework 2013-10-02 13:09:52 -07:00
api CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse 2013-11-05 16:12:36 +05:30
async Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
capacity CLOUDSTACK-4755: cloudstack 4.x does not allow memory upgrade 2013-11-04 16:45:11 -08:00
configuration [CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes." 2013-11-06 19:07:33 +05:30
consoleproxy ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
dc New Transaction API 2013-10-16 09:21:00 -07:00
deploy CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage 2013-11-04 16:45:06 -08:00
event Spring Modularization 2013-10-02 15:41:04 -07:00
ha A plugin for Hyper-V control is available for CloudStack. The plugin implements basic VM control; however, its 2013-11-04 18:48:53 +05:30
hypervisor ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
keystore merge master 2013-05-11 15:28:43 +05:30
metadata ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
network CLOUDSTACK-4736: Monitoring services in VR 2013-11-05 23:39:33 +05:30
projects Cleaner and more type safe Transaction API for checked exceptions 2013-10-23 10:02:43 -07:00
resource CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse 2013-11-05 16:12:36 +05:30
resourcelimit Cleaner and more type safe Transaction API for checked exceptions 2013-10-23 10:02:43 -07:00
secstorage merge master 2013-05-11 15:28:43 +05:30
server CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary 2013-10-28 21:01:31 -07:00
servlet New Transaction API 2013-10-16 09:21:00 -07:00
storage CLOUDSTACK-5017: Throw CloudRuntimeException in case of template/volume 2013-11-04 12:32:05 -08:00
tags Resource details (metadata) - added support for Storage pool details 2013-10-28 12:53:53 -07:00
template CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed 2013-11-01 18:07:00 -07:00
test Cleaner and more type safe Transaction API for checked exceptions 2013-10-23 10:02:43 -07:00
usage CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page 2013-10-31 15:25:57 -07:00
user Added an api call to import all the ldap users to the same domains(ou's) in cloudstack 2013-10-29 09:04:33 +00:00
uuididentity ResourceMetaData (Resource details) fixes: 2013-10-23 17:39:16 -07:00
vm add quiescevm in createvmsnapshotcmd 2013-10-31 16:45:05 -07:00