cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to 6721701
Date Sat, 07 Jun 2014 09:01:22 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 65bffefd0 -> 6721701a5


CLOUDSTACK-6669: Fix support resize in usage server

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit f0ea44daf12b702ab1deb03d4e6bc3adfab46efc)


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

Branch: refs/heads/4.4
Commit: 6721701a54109fc44e7ee1675563c77802d348ce
Parents: 65bffef
Author: Olivier Lemasle <olivier.lemasle@apalia.net>
Authored: Fri Jun 6 23:04:43 2014 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sat Jun 7 11:01:07 2014 +0200

----------------------------------------------------------------------
 usage/src/com/cloud/usage/parser/VolumeUsageParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6721701a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
index cd092a9..81ebdc0 100644
--- a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
+++ b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
@@ -87,7 +87,7 @@ public class VolumeUsageParser {
             long zoneId = usageVol.getZoneId();
             Long templateId = usageVol.getTemplateId();
             long size = usageVol.getSize();
-            String key = "" + volId;
+            String key = volId + "-" + doId + "-" + size;
 
             diskOfferingMap.put(key, new VolInfo(volId, zoneId, doId, templateId, size));
 


Mime
View raw message