cloudstack/server/src/com/cloud
Prasanna Santhanam 1b922e816c Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second"
Reverted as per discussion at http://s.apache.org/NOm

This reverts commit 5060f98268.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-01-31 18:15:41 +05:30
..
account Patch from Chip Childers 2012-07-02 09:51:21 -04:00
acl Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
agent CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state 2013-01-18 17:20:51 +05:30
alert refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
api CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
async Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-17 11:32:49 -08:00
baremetal CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 2013-01-18 16:49:52 +05:30
capacity CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14. 2012-08-31 13:40:18 -07:00
certificate/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
configuration CloudStack CLOUDSTACK-774 2013-01-29 17:19:57 -08:00
consoleproxy Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
dao EntityManager: Implement method to search by uuid including removed entities 2013-01-23 14:57:41 -08:00
dc api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
deploy refactor: remove redundant imports, fix trailing chars 2012-12-03 13:54:37 -08:00
domain api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
event Move view based VO and Dao classes to cloud-server module to hide the 2012-12-14 10:47:58 -08:00
ha Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
host/dao api_refactoring: Fix build issues and incorrect imports 2012-12-06 13:48:20 -08:00
hypervisor Merge branch 'master' into network-refactor-merge2 2013-01-16 19:17:14 -08:00
keystore Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
maint Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
migration Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
network CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
offerings reverting the earlier commit 432ea9c7d4 2013-01-16 15:10:27 +05:30
projects api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
resource CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
resourcelimit api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
secstorage Enforce InternalIdentity interface on all VO classes that impls long getId() 2012-12-26 15:09:44 -08:00
server CLOUDSTACK-617: Unable to edit a sub-domain. Change UpdateDomain to be consistent with CreateDomain i.e. before this operation, while checking if the domain-name is unique, search under the parent domain instead of searching under the ROOT domain. 2013-01-30 16:40:48 -08:00
service Patch from Chip Childers 2012-07-02 09:51:21 -04:00
servlet server: Fix ApiServer init method, we won't use cfg files and it's not used there 2013-01-09 17:20:46 -08:00
storage CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
tags api: Entities will extend InternalIdentity and Identity 2012-12-26 19:11:15 -08:00
template api: Refactor move acl to org.apache.cloudstack 2013-01-06 15:30:58 -08:00
test Fixed CLOUDSTACK-287 2012-10-09 09:37:27 -07:00
upgrade CLOUDSTACK-299: Egress firewall rules feature for guest network on VR 2013-01-31 11:20:47 +05:30
usage CLOUDSTACK-212: Move api response classes to cloud-api under org.apache.cloudstack 2013-01-05 16:27:36 -08:00
user CLOUDSTACK-1054: When calling listDomains through the API do not restrict ADMIN users 2013-01-30 15:48:01 +01:00
uuididentity server: Get rid of db helpers that work with IdentityMapper 2012-12-23 18:04:32 -08:00
vm Revert "CS-15922 : to avoid race condition when expunge vm, expunge interval and expunge deplay should be larger than 600 second" 2013-01-31 18:15:41 +05:30