cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [5/5] git commit: updated refs/heads/master to 3b511a1
Date Thu, 03 Dec 2015 18:55:03 GMT
Merge pull request #1155 from DaanHoogland/merge-4.6

Merge 4.6there is one (simple) conflict so for formailty's sake I make this a pull request.
@utscweizhou en @remibergsma please have a look/test-run

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

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


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

Branch: refs/heads/master
Commit: 3b511a139d31301e44028169d6b7bfeca08093d6
Parents: 186e025 f9775de
Author: Remi Bergsma <github@remi.nl>
Authored: Thu Dec 3 19:53:55 2015 +0100
Committer: Remi Bergsma <github@remi.nl>
Committed: Thu Dec 3 19:53:56 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(-)
----------------------------------------------------------------------



Mime
View raw message