GitHub user DaanHoogland opened a pull request:
https://github.com/apache/cloudstack/pull/1155
Merge 4.6
there is one (simple) conflict so for formailty's sake I make this a pull
request.
@utscweizhou en @remibergsma please have a look/test-run
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/DaanHoogland/cloudstack merge-4.6
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1155.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1155
----
commit 9077c9a5b47224b2d00978ff67e9af6957ec589b
Author: Wei Zhou <w.z...@tech.leaseweb.com>
Date: 2015-11-03T16:04:55Z
CLOUDSTACK-9022: keep Destroyed volumes for sometime
commit 4ed1e0d5f809d1bb2845b6e076d55eeb1ce3f0f4
Author: Wei Zhou <w.z...@tech.leaseweb.com>
Date: 2015-11-04T08:27:32Z
CLOUDSTACK-9022: move storage.cleanup related global configurations to
StorageManager
commit 5b7d935ab0b35bec936785e44023ac0d8552e72b
Author: Remi Bergsma <git...@remi.nl>
Date: 2015-12-02T20:52:46Z
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 <git...@remi.nl>
commit f9775de8ffcd0c07bfd7e670819e0142663cfde1
Author: Daan Hoogland <d...@onecht.net>
Date: 2015-12-03T09:35:00Z
Merge release branch 4.6 to master
* 4.6:
CLOUDSTACK-9022: move storage.cleanup related global configurations to
StorageManager
CLOUDSTACK-9022: keep Destroyed volumes for sometime
Conflicts:
server/src/com/cloud/storage/StorageManagerImpl.java
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
