cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: updated refs/heads/master to de42406
Date Mon, 18 Aug 2014 14:15:38 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6a8f8317f -> de424061b


CLOUDSTACK-7006: Restore template ID in ROOT volume usages

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>


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

Branch: refs/heads/master
Commit: de424061b277e81425ba39344952f4ee0767980e
Parents: 6a8f831
Author: Olivier Lemasle <olivier.lemasle@apalia.net>
Authored: Sun Jun 29 20:55:50 2014 +0200
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Mon Aug 18 10:14:26 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/de424061/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 e28da48..21b952f 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -696,7 +696,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());


Mime
View raw message