Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EDD2C200C7B for ; Sat, 20 May 2017 09:36:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EC624160BBC; Sat, 20 May 2017 07:36:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3EC28160BAD for ; Sat, 20 May 2017 09:36:49 +0200 (CEST) Received: (qmail 81003 invoked by uid 500); 20 May 2017 07:36:48 -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 80994 invoked by uid 99); 20 May 2017 07:36:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 May 2017 07:36:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 426AFDFC2E; Sat, 20 May 2017 07:36:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swapan@apache.org To: commits@ambari.apache.org Message-Id: <60c8131310774dbd8dfd5ec535ad0b59@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: Revert "AMBARI-21011. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6." Date: Sat, 20 May 2017 07:36:48 +0000 (UTC) archived-at: Sat, 20 May 2017 07:36:50 -0000 Repository: ambari Updated Branches: refs/heads/trunk 0a61f9857 -> 55af33635 Revert "AMBARI-21011. Append PATH to YARN config 'yarn.nodemanager.admin-env' for HDP 2.6." This reverts commit 6e4331e92f6b42fab3d36ea64df42019ae73e715 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55af3363 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55af3363 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55af3363 Branch: refs/heads/trunk Commit: 55af3363582162487eef3363f5ae5c4a16872652 Parents: 0a61f98 Author: Swapan Shridhar Authored: Sat May 20 00:34:11 2017 -0700 Committer: Swapan Shridhar Committed: Sat May 20 00:34:37 2017 -0700 ---------------------------------------------------------------------- .../HDP/2.6/services/YARN/configuration/yarn-site.xml | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/55af3363/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml index 754a2c2..cab0e65 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration/yarn-site.xml @@ -102,15 +102,6 @@ - yarn.nodemanager.admin-env - MALLOC_ARENA_MAX=$MALLOC_ARENA_MAX,PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH - - Environment variables that should be forwarded from the NodeManager's - environment to the container's. - - - - yarn.nodemanager.kill-escape.launch-command-line slider-agent,LLAP