Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B65F210898 for ; Fri, 27 Sep 2013 11:35:26 +0000 (UTC) Received: (qmail 59285 invoked by uid 500); 27 Sep 2013 11:35:26 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 59255 invoked by uid 500); 27 Sep 2013 11:35:26 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 59248 invoked by uid 99); 27 Sep 2013 11:35:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Sep 2013 11:35:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 17F6890C019; Fri, 27 Sep 2013 11:35:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: atkach@apache.org To: ambari-commits@incubator.apache.org Message-Id: <35259839910c404ebe27c3eed6c5cccf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-3357 Add ha_status property to status mapper request. (atkach) Date: Fri, 27 Sep 2013 11:35:26 +0000 (UTC) Updated Branches: refs/heads/branch-1.4.1 e725d44b3 -> 187d5b00d AMBARI-3357 Add ha_status property to status mapper request. (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/187d5b00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/187d5b00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/187d5b00 Branch: refs/heads/branch-1.4.1 Commit: 187d5b00d7a002394540eb970d2dea2e21847134 Parents: e725d44 Author: atkach Authored: Fri Sep 27 14:35:08 2013 +0300 Committer: atkach Committed: Fri Sep 27 14:35:21 2013 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/global/cluster_controller.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/187d5b00/ambari-web/app/controllers/global/cluster_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index db5f737..766d343 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -248,7 +248,8 @@ App.ClusterController = Em.Controller.extend({ return false; } var testUrl = App.get('isHadoop2Stack') ? '/data/dashboard/HDP2/services.json':'/data/dashboard/services.json'; - var servicesUrl = this.getUrl(testUrl, '/services?fields=ServiceInfo,components/host_components/HostRoles/desired_state,components/host_components/HostRoles/state'); + //desired_state property is eliminated since calculateState function is commented out, it become useless + var servicesUrl = this.getUrl(testUrl, '/services?fields=ServiceInfo,components/host_components/HostRoles/state,components/host_components/HostRoles/ha_status'); App.HttpClient.get(servicesUrl, App.statusMapper, { complete: callback