Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5323BC0AD for ; Tue, 2 Jul 2013 10:00:31 +0000 (UTC) Received: (qmail 91070 invoked by uid 500); 2 Jul 2013 10:00:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91046 invoked by uid 500); 2 Jul 2013 10:00:30 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 91036 invoked by uid 99); 2 Jul 2013 10:00:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jul 2013 10:00:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06BE35371D; Tue, 2 Jul 2013 10:00:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pranavs@apache.org To: commits@cloudstack.apache.org Message-Id: <0f606c8575de449dbfec0188da49a961@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 2da3be7 Date: Tue, 2 Jul 2013 10:00:29 +0000 (UTC) Updated Branches: refs/heads/master 9d6bd567f -> 2da3be7e3 routerVM scale up response Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2da3be7e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2da3be7e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2da3be7e Branch: refs/heads/master Commit: 2da3be7e3fd4e4388cfadeb2d032551acd7dfc8a Parents: 9d6bd56 Author: Pranav Saxena Authored: Tue Jul 2 15:29:42 2013 +0530 Committer: Pranav Saxena Committed: Tue Jul 2 15:29:42 2013 +0530 ---------------------------------------------------------------------- ui/scripts/system.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2da3be7e/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 1918a99..0c776e2 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7428,18 +7428,18 @@ dataType: "json", async: true, success: function(json) { - // var jid = json.scalevirtualmachineresponse.jobid; - args.response.success(); - /* {_custom: + var jid = json.scalevirtualmachineresponse.jobid; + args.response.success({ + _custom: {jobId: jid, getUpdatedItem: function(json) { return json.queryasyncjobresultresponse.jobresult.virtualmachine; }, getActionFilter: function() { - return vmActionfilter; + return routerActionfilter; } } - }*/ + }); }, error:function(json){