Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-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 50805175CC for ; Thu, 18 Jun 2015 18:25:09 +0000 (UTC) Received: (qmail 52281 invoked by uid 500); 18 Jun 2015 18:24:41 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 51944 invoked by uid 500); 18 Jun 2015 18:24:41 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 49758 invoked by uid 99); 18 Jun 2015 18:24:40 -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; Thu, 18 Jun 2015 18:24:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C88A2E3CB0; Thu, 18 Jun 2015 18:24:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjshen@apache.org To: common-commits@hadoop.apache.org Date: Thu, 18 Jun 2015 18:25:24 -0000 Message-Id: In-Reply-To: <4c0d3a1bd9874f39bd3469db48d05967@git.apache.org> References: <4c0d3a1bd9874f39bd3469db48d05967@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] [abbrv] hadoop git commit: YARN-3824. Fix two minor nits in member variable properties of YarnConfiguration. Contributed by Ray Chiang. YARN-3824. Fix two minor nits in member variable properties of YarnConfiguration. Contributed by Ray Chiang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d6e632a7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d6e632a7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d6e632a7 Branch: refs/heads/YARN-2928 Commit: d6e632a7c5c90963c7a3852c7be808150361cc55 Parents: e922a27 Author: Devaraj K Authored: Thu Jun 18 16:44:08 2015 +0530 Committer: Zhijie Shen Committed: Thu Jun 18 11:19:02 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6e632a7/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 6bf0620..a4ffa03 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -636,6 +636,9 @@ Release 2.8.0 - UNRELEASED YARN-3617. Fix WindowsResourceCalculatorPlugin.getCpuFrequency() returning always -1. (J.Andreina via devaraj) + YARN-3824. Fix two minor nits in member variable properties + of YarnConfiguration. (Ray Chiang via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/d6e632a7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 9011a5a..23e6b11 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -279,7 +279,7 @@ public class YarnConfiguration extends Configuration { + "intermediate-data-encryption.enable"; @Private - public static final Boolean DEFAULT_YARN_INTERMEDIATE_DATA_ENCRYPTION = false; + public static final boolean DEFAULT_YARN_INTERMEDIATE_DATA_ENCRYPTION = false; /** The address of the RM admin interface.*/ public static final String RM_ADMIN_ADDRESS = @@ -760,7 +760,7 @@ public class YarnConfiguration extends Configuration { public static final String RM_PROXY_USER_PRIVILEGES_ENABLED = RM_PREFIX + "proxy-user-privileges.enabled"; - public static boolean DEFAULT_RM_PROXY_USER_PRIVILEGES_ENABLED = false; + public static final boolean DEFAULT_RM_PROXY_USER_PRIVILEGES_ENABLED = false; /** * How many diagnostics/failure messages can be saved in RM for