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 a2a82f5
Date Tue, 11 Nov 2014 21:15:49 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 ee8facd38 -> a2a82f517


CLOUDSTACK-3383 escaped "'s


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

Branch: refs/heads/4.4
Commit: a2a82f517b124a993d77af1e962ec7f5b5639052
Parents: ee8facd
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Nov 11 22:15:35 2014 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Tue Nov 11 22:15:35 2014 +0100

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a2a82f51/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index e075c73..9eec678 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3255,7 +3255,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
     private Answer execute(GetHostStatsCommand cmd) {
         final Script cpuScript = new Script("/bin/bash", s_logger);
         cpuScript.add("-c");
-        cpuScript.add("idle=$(top -b -n 1| awk -F, '/^[%]*[Cc]pu/{$0=$4; gsub(/[^0-9.,]+/,"");
print }'); echo $idle");
+        cpuScript.add("idle=$(top -b -n 1| awk -F, '/^[%]*[Cc]pu/{$0=$4; gsub(/[^0-9.,]+/,\"\");
print }'); echo $idle");
 
         final OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser();
         String result = cpuScript.execute(parser);


Mime
View raw message