You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2014/06/30 15:10:39 UTC
git commit: updated refs/heads/4.3 to caa102c
Repository: cloudstack
Updated Branches:
refs/heads/4.3 8d0f49add -> caa102c23
CLOUDSTACK-7006: Restore template ID in ROOT volume usages
Signed-off-by: Sebastien Goasguen <ru...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/caa102c2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/caa102c2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/caa102c2
Branch: refs/heads/4.3
Commit: caa102c23d352d8e9f2f8a4f4159a3fc7d776f26
Parents: 8d0f49a
Author: Olivier Lemasle <ol...@apalia.net>
Authored: Sun Jun 29 20:30:51 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Jun 30 15:10:17 2014 +0200
----------------------------------------------------------------------
.../apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/caa102c2/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 2f181ab..66e6cc5 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -701,7 +701,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
vol.getId(),
vol.getName(),
offeringId,
- null,
+ vol.getTemplateId(),
size,
Volume.class.getName(),
vol.getUuid());