Updated Branches: refs/heads/master a59067e94 -> ecbce6a67
fix disk IO requests display error Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ecbce6a6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ecbce6a6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ecbce6a6 Branch: refs/heads/master Commit: ecbce6a67f675a0869a62462defed8ee316f139c Parents: a59067e Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Jun 10 23:11:48 2013 +0200 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Jun 10 23:11:48 2013 +0200 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java | 2 +- ui/scripts/instances.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ecbce6a6/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java index 7f9ceeb..92f6e39 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeDef.java @@ -73,7 +73,7 @@ public class LibvirtStorageVolumeDef { storageVolBuilder.append("<name>" + _volName + "</name>\n"); if (_volSize != null) { storageVolBuilder - .append("<capacity >" + _volSize + "</capacity>\n"); + .append("<capacity>" + _volSize + "</capacity>\n"); } storageVolBuilder.append("<target>\n"); storageVolBuilder.append("<format type='" + _volFormat + "'/>\n"); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ecbce6a6/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 7149815..33a5767 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1670,8 +1670,8 @@ networkkbswrite: (jsonObj.networkkbswrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.networkkbswrite * 1024), diskkbsread: (jsonObj.diskkbsread == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskkbsread * 1024), diskkbswrite: (jsonObj.diskkbswrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskkbswrite * 1024), - diskioread: (jsonObj.diskioread == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskioread * 1024), - diskiowrite: (jsonObj.diskiowrite == null)? "N/A": cloudStack.converters.convertBytes(jsonObj.diskiowrite * 1024) + diskioread: (jsonObj.diskioread == null)? "N/A": jsonObj.diskioread, + diskiowrite: (jsonObj.diskiowrite == null)? "N/A": jsonObj.diskiowrite } }); }
