[3/5] git commit: updated refs/heads/master to 3b511a1

[re...@apache.org]

Merge pull request #1145 from ustcweizhou/storage-cleanup-delay-4.6

[4.6.1] CLOUDSTACK-9022: keep Destroyed volumes for sometimefor now, the Destroyed volumes will be expunged in Storage cleanup thread, no matter when they are destroyed.
In Expunging vm thread, we expunge the Destroyed vms which have been destroyed at least 'expunge.delay' seconds. We add the similar configuration for volumes.

same to #1029 , for 4.6

* pr/1145:
  CLOUDSTACK-9022: move storage.cleanup related global configurations to StorageManager
  CLOUDSTACK-9022: keep Destroyed volumes for sometime

This closes #1029

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5b7d935a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5b7d935a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5b7d935a

Branch: refs/heads/master
Commit: 5b7d935ab0b35bec936785e44023ac0d8552e72b
Parents: cb50eb8 4ed1e0d
Author: Remi Bergsma <gi...@remi.nl>
Authored: Wed Dec 2 21:52:46 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Wed Dec 2 21:53:11 2015 +0100

----------------------------------------------------------------------
 .../src/com/cloud/storage/dao/VolumeDao.java    |  3 ++
 .../com/cloud/storage/dao/VolumeDaoImpl.java    | 10 ++++++
 server/src/com/cloud/configuration/Config.java  |  9 -----
 .../src/com/cloud/storage/StorageManager.java   |  8 +++++
 .../com/cloud/storage/StorageManagerImpl.java   | 36 +++++++++++---------
 5 files changed, 41 insertions(+), 25 deletions(-)
----------------------------------------------------------------------