You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/03 19:55:02 UTC
[4/5] git commit: updated refs/heads/master to 3b511a1
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f9775de8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f9775de8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f9775de8
Branch: refs/heads/master
Commit: f9775de8ffcd0c07bfd7e670819e0142663cfde1
Parents: 6d558c0 5b7d935
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu Dec 3 10:35:00 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Dec 3 10:35:00 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9775de8/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9775de8/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9775de8/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/storage/StorageManagerImpl.java
index 87ff913,b8890bf..3d7146e
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@@ -188,7 -191,8 +190,7 @@@ import com.cloud.vm.VirtualMachine.Stat
import com.cloud.vm.dao.VMInstanceDao;
@Component
- public class StorageManagerImpl extends ManagerBase implements StorageManager, ClusterManagerListener {
-@Local(value = {StorageManager.class, StorageService.class})
+ public class StorageManagerImpl extends ManagerBase implements StorageManager, ClusterManagerListener, Configurable {
private static final Logger s_logger = Logger.getLogger(StorageManagerImpl.class);
protected String _name;