Merge remote-tracking branch 'origin/hotfix/4.4-7006' into 4.4

This commit is contained in:
Daan Hoogland 2014-08-18 20:23:58 +02:00
commit 13bde03adf
1 changed files with 1 additions and 1 deletions

View File

@ -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());