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 D55721088C for ; Thu, 27 Mar 2014 16:52:57 +0000 (UTC) Received: (qmail 71012 invoked by uid 500); 27 Mar 2014 16:52:57 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 70974 invoked by uid 500); 27 Mar 2014 16:52:56 -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 70966 invoked by uid 99); 27 Mar 2014 16:52:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Mar 2014 16:52:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2429389466B; Thu, 27 Mar 2014 16:52:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: atkach@apache.org To: commits@ambari.apache.org Message-Id: <452955a40a7f46048550adc8cf38bd6f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-5248 Says Falcon in proxy user with HDP 2.0 stack. (atkach) Date: Thu, 27 Mar 2014 16:52:56 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk be3e5c6d3 -> 718567fc4 AMBARI-5248 Says Falcon in proxy user with HDP 2.0 stack. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/718567fc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/718567fc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/718567fc Branch: refs/heads/trunk Commit: 718567fc453cfa854c4cfb63c3b26d9a16b30d62 Parents: be3e5c6 Author: atkach Authored: Thu Mar 27 18:48:46 2014 +0200 Committer: atkach Committed: Thu Mar 27 18:48:46 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/admin/misc_controller.js | 7 +++++++ ambari-web/app/data/global_properties.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/718567fc/ambari-web/app/controllers/main/admin/misc_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/misc_controller.js b/ambari-web/app/controllers/main/admin/misc_controller.js index 787fc07..57de024 100644 --- a/ambari-web/app/controllers/main/admin/misc_controller.js +++ b/ambari-web/app/controllers/main/admin/misc_controller.js @@ -17,6 +17,7 @@ */ var App = require('app'); +var stringUtils = require('utils/string_utils'); require('controllers/main/service/info/configs'); @@ -64,6 +65,12 @@ App.MainAdminMiscController = App.MainServiceInfoConfigsController.extend({ var sorted = []; + //stack, with version lower than 2.1, doesn't have Falcon service + var proxyUserGroup = misc_configs.findProperty('name', 'proxyuser_group'); + if (proxyUserGroup && stringUtils.compareVersions(App.get('currentStackVersionNumber'), "2.1") !== 1) { + proxyUserGroup.set('displayName', "Proxy group for Hive, WebHCat and Oozie"); + } + if(sortOrder) { sortOrder.forEach(function(name) { var user = misc_configs.findProperty('name', name); http://git-wip-us.apache.org/repos/asf/ambari/blob/718567fc/ambari-web/app/data/global_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/global_properties.js b/ambari-web/app/data/global_properties.js index 38e0b49..5772b50 100644 --- a/ambari-web/app/data/global_properties.js +++ b/ambari-web/app/data/global_properties.js @@ -1196,7 +1196,7 @@ module.exports = { "id": "puppet var", "name": "proxyuser_group", - "displayName": "Proxy group for Hive, WebHCat, and Oozie", + "displayName": "Proxy group for Hive, WebHCat and Oozie", "description": "", "defaultValue": "users", "isReconfigurable": false,