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/08/18 16:19:22 UTC
git commit: updated refs/heads/hotfix/4.4-7006 to 23b8196
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4-7006 [created] 23b819644
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/23b81964
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23b81964
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23b81964
Branch: refs/heads/hotfix/4.4-7006
Commit: 23b8196445d962f15f97df03e8dac9ae0b80e56b
Parents: 838a1a8
Author: Olivier Lemasle <ol...@apalia.net>
Authored: Sun Jun 29 20:55:50 2014 +0200
Committer: Sebastien Goasguen <ru...@gmail.com>
Committed: Mon Aug 18 10:18:06 2014 -0400
----------------------------------------------------------------------
.../apache/cloudstack/engine/orchestration/VolumeOrchestrator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23b81964/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 76281c6..95b4cc0 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -668,7 +668,7 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
offeringId = offering.getId();
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, null, size,
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offeringId, vol.getTemplateId(), size,
Volume.class.getName(), vol.getUuid(), vol.isDisplayVolume());
_resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume, vol.isDisplayVolume());