You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2012/11/16 11:00:31 UTC
[29/50] git commit: CS-16096: cloudstack 3.0 UI - autoscale - fix a
regression caused by a server-server side change:
ad6ac9b4498cc47c5f111fc0627a7ccfcd3dfe78 (CS-15617. Changed CounterResponse
to a List as queryAsyncJob expects it.) (Reviewed-by: Brian)
CS-16096: cloudstack 3.0 UI - autoscale - fix a regression caused by a server-server side change: ad6ac9b4498cc47c5f111fc0627a7ccfcd3dfe78 (CS-15617. Changed CounterResponse to a List as queryAsyncJob expects it.) (Reviewed-by: Brian)
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9365e540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9365e540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9365e540
Branch: refs/heads/master
Commit: 9365e5403b96eaee93812f57c65b0035b615112a
Parents: e20f599
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Aug 20 13:56:46 2012 -0700
Committer: Vijay Venkatachalam <vi...@citrix.com>
Committed: Fri Nov 16 10:56:54 2012 +0530
----------------------------------------------------------------------
ui/scripts/autoscaler.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9365e540/ui/scripts/autoscaler.js
----------------------------------------------------------------------
diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js
index 39e6e30..81ec51f 100644
--- a/ui/scripts/autoscaler.js
+++ b/ui/scripts/autoscaler.js
@@ -139,7 +139,7 @@
$(autoscaleVmGroup.scaleuppolicies[0].conditions).each(function(){
var condition = {
id: this.id,
- counterid: this.counter.id,
+ counterid: this.counter[0].id,
relationaloperator: this.relationaloperator,
threshold: this.threshold
};
@@ -154,7 +154,7 @@
$(autoscaleVmGroup.scaledownpolicies[0].conditions).each(function(){
var condition = {
id: this.id,
- counterid: this.counter.id,
+ counterid: this.counter[0].id,
relationaloperator: this.relationaloperator,
threshold: this.threshold.toString()
};