Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-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 0ECFE10969 for ; Tue, 4 Nov 2014 15:47:08 +0000 (UTC) Received: (qmail 3223 invoked by uid 500); 4 Nov 2014 15:47:08 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 3194 invoked by uid 500); 4 Nov 2014 15:47:07 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 3185 invoked by uid 99); 4 Nov 2014 15:47:07 -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, 04 Nov 2014 15:47:07 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ADBFFA09C43; Tue, 4 Nov 2014 15:47:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ababiichuk@apache.org To: commits@ambari.apache.org Message-Id: <31803eca9e7246a4a5317b87f579e9c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-8139 NNHA wizard shows incorrect component layout. (ababiichuk) Date: Tue, 4 Nov 2014 15:47:07 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 9f27e084b -> 5f05539b1 AMBARI-8139 NNHA wizard shows incorrect component layout. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5f05539b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5f05539b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5f05539b Branch: refs/heads/trunk Commit: 5f05539b1a04948ea141670bcaa7f25f08c3a3ad Parents: 9f27e08 Author: aBabiichuk Authored: Tue Nov 4 16:17:48 2014 +0200 Committer: aBabiichuk Committed: Tue Nov 4 16:17:48 2014 +0200 ---------------------------------------------------------------------- .../main/admin/highAvailability/nameNode/step2_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5f05539b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step2_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step2_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step2_controller.js index e7e77bb..2bdd691 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step2_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/step2_controller.js @@ -33,7 +33,7 @@ App.HighAvailabilityWizardStep2Controller = App.WizardStep5Controller.extend({ * master components supported by Ambari */ - multipleComponents: ['NAMENODE', 'JOURNALNODE','ZOOKEEPER_SERVER','HBASE_MASTER'], + multipleComponents: ['NAMENODE', 'JOURNALNODE','ZOOKEEPER_SERVER','HBASE_MASTER','RESOURCEMANAGER'], /** * overrides method in wizardStep5Controller