cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to d7f4498
Date Fri, 22 May 2015 12:34:08 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 274222769 -> d7f4498f7


kvm: Strip trailing comma for qemu-img convert options

Fix trailing comma for qemu-img convert options, Qemu 2.0+ not tolerant to it

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 90ac1aba13d431cdccf51dde2c4727b96388d985)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/master
Commit: d7f4498f76e3b743b4f968a456aab66be510f5e3
Parents: 2742227
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri May 22 13:32:56 2015 +0100
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri May 22 13:33:54 2015 +0100

----------------------------------------------------------------------
 .../kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java           | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7f4498f/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
index e8dbf92..500c2d0 100644
--- a/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
+++ b/plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java
@@ -236,6 +236,7 @@ public class QemuImg {
             for (Map.Entry<String, String> option : options.entrySet()) {
                 optionsStr += option.getKey() + "=" + option.getValue() + ",";
             }
+            optionsStr = optionsStr.replaceAll(",$", "");
             s.add(optionsStr);
         }
 


Mime
View raw message