cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [11/13] git commit: updated refs/heads/4.3 to 15ded4f
Date Mon, 24 Nov 2014 18:26:07 GMT
CLOUDSTACK-6669: Fix support resize in usage server

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit 303e6ffc1e36a5d1ba2a1d48093f996fef1614df)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	usage/src/com/cloud/usage/parser/VolumeUsageParser.java


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

Branch: refs/heads/4.3
Commit: ed90e0c751b138acf35ef4af2b46e36f6b2c5b83
Parents: 06a664b
Author: Olivier Lemasle <olivier.lemasle@apalia.net>
Authored: Fri Jun 6 23:04:43 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Nov 24 23:47:04 2014 +0530

----------------------------------------------------------------------
 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/ed90e0c7/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 2ac1e0a..b6a12de 100644
--- a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
+++ b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java
@@ -85,7 +85,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